diff options
| author | KC Sivaramakrishnan <kc@kcsrk.info> | 2020-11-06 15:15:52 +0530 |
|---|---|---|
| committer | KC Sivaramakrishnan <kc@kcsrk.info> | 2020-11-06 15:15:52 +0530 |
| commit | 179dacf792c9468046f3beb9affb79b4cfa08351 (patch) | |
| tree | 993ef1af87bbce21515c8b09c01aa7e65cb81f5c /middle_end | |
| parent | a08b30630ba70159a09e0977d23935cf999d4bc9 (diff) | |
| parent | bb59da789240d06c72dcb55ca0742d333ead4cd5 (diff) | |
| download | ocaml-179dacf792c9468046f3beb9affb79b4cfa08351.tar.gz | |
Merge upstream updates
Diffstat (limited to 'middle_end')
| -rw-r--r-- | middle_end/internal_variable_names.ml | 4 | ||||
| -rw-r--r-- | middle_end/semantics_of_primitives.ml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/middle_end/internal_variable_names.ml b/middle_end/internal_variable_names.ml index 3a0e26f1bc..16f969288f 100644 --- a/middle_end/internal_variable_names.ml +++ b/middle_end/internal_variable_names.ml @@ -175,7 +175,7 @@ let patomic_fetch_add = "Patomic_fetch_add" let patomic_load = "Patomic_load" let prunstack = "Prunstack" let pperform = "Pperform" -let presume = "Pperform" +let presume = "Presume" let preperform = "Preperform" let ppoll = "Ppoll" let pnop = "Pnop" @@ -288,7 +288,7 @@ let patomic_fetch_add_arg = "Patomic_fetch_add_arg" let patomic_load_arg = "Patomic_load_arg" let prunstack_arg = "Prunstack_arg" let pperform_arg = "Pperform_arg" -let presume_arg = "Pperform_arg" +let presume_arg = "Presume_arg" let preperform_arg = "Preperform_arg" let ppoll_arg = "Ppoll_arg" let pnop_arg = "Pnop_arg" diff --git a/middle_end/semantics_of_primitives.ml b/middle_end/semantics_of_primitives.ml index 9fb6f77500..cc3d18ef94 100644 --- a/middle_end/semantics_of_primitives.ml +++ b/middle_end/semantics_of_primitives.ml @@ -21,7 +21,7 @@ type coeffects = No_coeffects | Has_coeffects let for_primitive (prim : Clambda_primitives.primitive) = match prim with - | Pmakeblock _ | Ppoll + | Pmakeblock _ | Pmakearray (_, Mutable) -> Only_generative_effects, No_coeffects | Pmakearray (_, Immutable) -> No_effects, No_coeffects | Pduparray (_, Immutable) -> @@ -39,6 +39,7 @@ let for_primitive (prim : Clambda_primitives.primitive) = | Pccall _ -> Arbitrary_effects, Has_coeffects | Praise _ -> Arbitrary_effects, No_coeffects | Prunstack | Pperform | Presume | Preperform -> Arbitrary_effects, Has_coeffects + | Ppoll -> Arbitrary_effects, Has_coeffects | Pnot | Pnegint | Paddint |