Skip to content

Commit

Permalink
Add %frame_pointers (#10419)
Browse files Browse the repository at this point in the history
  • Loading branch information
dra27 committed May 20, 2021
1 parent 9b887df commit 6e3c90d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
2 changes: 0 additions & 2 deletions .depend
Expand Up @@ -2992,15 +2992,13 @@ asmcomp/selection.cmi : \
asmcomp/spill.cmo : \
asmcomp/reg.cmi \
asmcomp/proc.cmi \
utils/misc.cmi \
asmcomp/mach.cmi \
asmcomp/cmm.cmi \
utils/clflags.cmi \
asmcomp/spill.cmi
asmcomp/spill.cmx : \
asmcomp/reg.cmx \
asmcomp/proc.cmx \
utils/misc.cmx \
asmcomp/mach.cmx \
asmcomp/cmm.cmx \
utils/clflags.cmx \
Expand Down
4 changes: 4 additions & 0 deletions Changes
Expand Up @@ -124,6 +124,10 @@ Working version
in the spilling and reloading passes
(Xavier Leroy, review by Vincent Laviron)

- #10419: Add %frame_pointers primitive which is true only in native code with
frame pointers mode enabled.
(David Allsopp, review by Vincent Laviron and Mark Shinwell)

### Type system:

* #10081: Typecheck `x |> f` and `f @@ x` as `(f x)`
Expand Down
12 changes: 10 additions & 2 deletions lambda/translprim.ml
Expand Up @@ -88,6 +88,7 @@ type prim =
| Send
| Send_self
| Send_cache
| Frame_pointers

let used_primitives = Hashtbl.create 7
let add_used_primitive loc env path =
Expand Down Expand Up @@ -143,6 +144,7 @@ let primitives_table =
"%ostype_unix", Primitive ((Pctconst Ostype_unix), 1);
"%ostype_win32", Primitive ((Pctconst Ostype_win32), 1);
"%ostype_cygwin", Primitive ((Pctconst Ostype_cygwin), 1);
"%frame_pointers", Frame_pointers;
"%negint", Primitive (Pnegint, 1);
"%succint", Primitive ((Poffsetint 1), 1);
"%predint", Primitive ((Poffsetint(-1)), 1);
Expand Down Expand Up @@ -695,9 +697,14 @@ let lambda_of_prim prim_name prim loc args arg_exps =
Lsend(Cached, meth, obj, [cache; pos], loc)
else
Lsend(Public, meth, obj, [], loc)
| Frame_pointers, [] ->
let frame_pointers =
if !Clflags.native_code && Config.with_frame_pointers then 1 else 0
in
Lconst (const_int frame_pointers)
| (Raise _ | Raise_with_backtrace
| Lazy_force | Loc _ | Primitive _ | Comparison _
| Send | Send_self | Send_cache), _ ->
| Send | Send_self | Send_cache | Frame_pointers), _ ->
raise(Error(to_location loc, Wrong_arity_builtin_primitive prim_name))

let check_primitive_arity loc p =
Expand All @@ -713,6 +720,7 @@ let check_primitive_arity loc p =
| Loc _ -> p.prim_arity = 1 || p.prim_arity = 0
| Send | Send_self -> p.prim_arity = 2
| Send_cache -> p.prim_arity = 4
| Frame_pointers -> p.prim_arity = 0
in
if not ok then raise(Error(loc, Wrong_arity_builtin_primitive p.prim_name))

Expand Down Expand Up @@ -782,7 +790,7 @@ let primitive_needs_event_after = function
| Comparison(comp, knd) ->
lambda_primitive_needs_event_after (comparison_primitive comp knd)
| Lazy_force | Send | Send_self | Send_cache -> true
| Raise _ | Raise_with_backtrace | Loc _ -> false
| Raise _ | Raise_with_backtrace | Loc _ | Frame_pointers -> false

let transl_primitive_application loc p env ty path exp args arg_exps =
let prim =
Expand Down

0 comments on commit 6e3c90d

Please sign in to comment.