summaryrefslogtreecommitdiff
path: root/src/jib/jib_compile.ml
diff options
context:
space:
mode:
authorAlasdair Armstrong2020-07-15 13:27:35 +0100
committerGitHub2020-07-15 13:27:35 +0100
commitd7a77f7e13dfcf5c8ef607dbabef801141ffacaa (patch)
tree02bb7ca494ace110617aa2665a953f609646cf24 /src/jib/jib_compile.ml
parent71694474c5d59f61fb6b96ac396d30c6c43a2c73 (diff)
parent3bf8126178f7d3aca41686b3759cf35e9284a06c (diff)
Merge pull request #77 from julienfreche/fix_name_instead_of_global_c2
c2: primop: -O: make sure to pick global or name correctly
Diffstat (limited to 'src/jib/jib_compile.ml')
-rw-r--r--src/jib/jib_compile.ml12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/jib/jib_compile.ml b/src/jib/jib_compile.ml
index 5e234eae..5bf53009 100644
--- a/src/jib/jib_compile.ml
+++ b/src/jib/jib_compile.ml
@@ -182,6 +182,12 @@ module type Config = sig
val track_throw : bool
end
+let name_or_global ctx id =
+ if Env.is_register id ctx.local_env || IdSet.mem id (Env.get_toplevel_lets ctx.local_env) then
+ global id
+ else
+ name id
+
module Make(C: Config) = struct
let ctyp_of_typ ctx typ = C.convert_typ ctx typ
@@ -191,12 +197,6 @@ let rec chunkify n xs =
| xs, [] -> [xs]
| xs, ys -> xs :: chunkify n ys
-let name_or_global ctx id =
- if Env.is_register id ctx.local_env || IdSet.mem id (Env.get_toplevel_lets ctx.local_env) then
- global id
- else
- name id
-
let coverage_branch_count = ref 0
let coverage_loc_args l =