Skip to content

Eliminators for tagged heap objects #273

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
ggreif merged 4 commits into from
Mar 26, 2019
Merged

Eliminators for tagged heap objects #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b78591e
suggestion for eliminators, draft
ggreif Mar 26, 2019
cfb9a6c
review feedback, bugfix
ggreif Mar 26, 2019
424f82d
refine the ideas
ggreif Mar 26, 2019
98f2d9d
simplify
ggreif Mar 26, 2019
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
39 changes: 26 additions & 13 deletions src/compile.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,8 +920,27 @@ module Tagged = struct
set_tag ^^
go cases

let branch env retty (cases : (tag * G.t) list) : G.t =
branch_default env retty (G.i Unreachable) cases
(* like branch_default but the tag is known statically *)
let branch env retty = function
| [] -> failwith "branch"
| [_, code] -> G.i Drop ^^ code
| (_, code) :: cases -> branch_default env retty code cases

(* like branch_default but also pushes the scrutinee on the stack for the
* branch's consumption *)
let _branch_default_with env retty def cases =
let (set_o, get_o) = new_local env "o" in
let prep (t, code) = (t, get_o ^^ code)
in set_o ^^ get_o ^^ branch_default env retty def (List.map prep cases)

(* like branch_default_with but the tag is known statically *)
let branch_with env retty = function
| [] -> failwith "branch_with"
| [_, code] -> code
| (_, code) :: cases ->
let (set_o, get_o) = new_local env "o" in
let prep (t, code) = (t, get_o ^^ code)
in set_o ^^ get_o ^^ branch_default env retty (get_o ^^ code) (List.map prep cases)

let obj env tag element_instructions : G.t =
Heap.obj env @@
Expand Down Expand Up @@ -4038,18 +4057,12 @@ and compile_exp (env : E.t) exp =
| DotE (e, ({it = Name n;_} as name)) ->
SR.Vanilla,
compile_exp_vanilla env e ^^
begin
let obj = Object.load_idx env e.note.note_typ name in
let (set_o, get_o) = new_local env "o" in
let selective tag = function
| None -> [] | Some code -> [ tag, get_o ^^ code ]
in match selective Tagged.Array (Array.fake_object_idx env n)
@ selective Tagged.Text (Text.fake_object_idx env n) with
| [] -> obj
| l -> set_o ^^ get_o ^^
Tagged.branch env (ValBlockType (Some I32Type))
((Tagged.Object, get_o ^^ obj) :: l)
end
| None -> [] | Some code -> [ tag, code ]
in Tagged.branch_with env (ValBlockType (Some I32Type))
(List.concat [ [Tagged.Object, Object.load_idx env e.note.note_typ name]
; selective Tagged.Array (Array.fake_object_idx env n)
; selective Tagged.Text (Text.fake_object_idx env n)])
| ActorDotE (e, ({it = Name n;_} as name)) ->
SR.UnboxedReference,
if E.mode env <> DfinityMode then G.i Unreachable else
Expand Down
2 changes: 1 addition & 1 deletion test/run-dfinity/ok/nary-async.wasm.stderr.ok
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
deserialize: T/77
prelude:107.1-132.2: internal error, File "compile.ml", line 2693, characters 21-27: Assertion failed
prelude:107.1-132.2: internal error, File "compile.ml", line 2712, characters 21-27: Assertion failed

Last environment:
@new_async = func
Expand Down