summaryrefslogtreecommitdiff
path: root/compiler/SymbolicToPure.ml
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/SymbolicToPure.ml')
-rw-r--r--compiler/SymbolicToPure.ml312
1 files changed, 185 insertions, 127 deletions
diff --git a/compiler/SymbolicToPure.ml b/compiler/SymbolicToPure.ml
index 5dc8664a..3512270a 100644
--- a/compiler/SymbolicToPure.ml
+++ b/compiler/SymbolicToPure.ml
@@ -107,6 +107,7 @@ type loop_info = {
input_vars : var list;
input_svl : V.symbolic_value list;
type_args : ty list;
+ const_generic_args : const_generic list;
forward_inputs : texpression list option;
(** The forward inputs are initialized at [None] *)
forward_output_no_state_no_result : var option;
@@ -240,6 +241,8 @@ let bs_ctx_to_ctx_formatter (ctx : bs_ctx) : Print.Contexts.ctx_formatter =
r_to_string;
type_var_id_to_string;
type_decl_id_to_string = ast_fmt.type_decl_id_to_string;
+ const_generic_var_id_to_string = ast_fmt.const_generic_var_id_to_string;
+ global_decl_id_to_string = ast_fmt.global_decl_id_to_string;
adt_variant_to_string = ast_fmt.adt_variant_to_string;
var_id_to_string;
adt_field_names = ast_fmt.adt_field_names;
@@ -247,10 +250,12 @@ let bs_ctx_to_ctx_formatter (ctx : bs_ctx) : Print.Contexts.ctx_formatter =
let bs_ctx_to_pp_ast_formatter (ctx : bs_ctx) : PrintPure.ast_formatter =
let type_params = ctx.fun_decl.signature.type_params in
+ let cg_params = ctx.fun_decl.signature.const_generic_params in
let type_decls = ctx.type_context.llbc_type_decls in
let fun_decls = ctx.fun_context.llbc_fun_decls in
let global_decls = ctx.global_context.llbc_global_decls in
PrintPure.mk_ast_formatter type_decls fun_decls global_decls type_params
+ cg_params
let symbolic_value_to_string (ctx : bs_ctx) (sv : V.symbolic_value) : string =
let fmt = bs_ctx_to_ctx_formatter ctx in
@@ -273,8 +278,12 @@ let rty_to_string (ctx : bs_ctx) (ty : T.rty) : string =
let type_decl_to_string (ctx : bs_ctx) (def : type_decl) : string =
let type_params = def.type_params in
+ let cg_params = def.const_generic_params in
let type_decls = ctx.type_context.llbc_type_decls in
- let fmt = PrintPure.mk_type_formatter type_decls type_params in
+ let global_decls = ctx.global_context.llbc_global_decls in
+ let fmt =
+ PrintPure.mk_type_formatter type_decls global_decls type_params cg_params
+ in
PrintPure.type_decl_to_string fmt def
let texpression_to_string (ctx : bs_ctx) (e : texpression) : string =
@@ -283,21 +292,25 @@ let texpression_to_string (ctx : bs_ctx) (e : texpression) : string =
let fun_sig_to_string (ctx : bs_ctx) (sg : fun_sig) : string =
let type_params = sg.type_params in
+ let cg_params = sg.const_generic_params in
let type_decls = ctx.type_context.llbc_type_decls in
let fun_decls = ctx.fun_context.llbc_fun_decls in
let global_decls = ctx.global_context.llbc_global_decls in
let fmt =
PrintPure.mk_ast_formatter type_decls fun_decls global_decls type_params
+ cg_params
in
PrintPure.fun_sig_to_string fmt sg
let fun_decl_to_string (ctx : bs_ctx) (def : Pure.fun_decl) : string =
let type_params = def.signature.type_params in
+ let cg_params = def.signature.const_generic_params in
let type_decls = ctx.type_context.llbc_type_decls in
let fun_decls = ctx.fun_context.llbc_fun_decls in
let global_decls = ctx.global_context.llbc_global_decls in
let fmt =
PrintPure.mk_ast_formatter type_decls fun_decls global_decls type_params
+ cg_params
in
PrintPure.fun_decl_to_string fmt def
@@ -315,16 +328,17 @@ let abs_to_string (ctx : bs_ctx) (abs : V.abs) : string =
Print.Values.abs_to_string fmt verbose indent indent_incr abs
let get_instantiated_fun_sig (fun_id : A.fun_id)
- (back_id : T.RegionGroupId.id option) (tys : ty list) (ctx : bs_ctx) :
- inst_fun_sig =
+ (back_id : T.RegionGroupId.id option) (tys : ty list)
+ (cgs : const_generic list) (ctx : bs_ctx) : inst_fun_sig =
(* Lookup the non-instantiated function signature *)
let sg =
(RegularFunIdNotLoopMap.find (fun_id, back_id) ctx.fun_context.fun_sigs).sg
in
(* Create the substitution *)
let tsubst = make_type_subst sg.type_params tys in
+ let cgsubst = make_const_generic_subst sg.const_generic_params cgs in
(* Apply *)
- fun_sig_substitute tsubst sg
+ fun_sig_substitute tsubst cgsubst sg
let bs_ctx_lookup_llbc_type_decl (id : TypeDeclId.id) (ctx : bs_ctx) :
T.type_decl =
@@ -380,17 +394,17 @@ let bs_ctx_register_backward_call (abs : V.abs) (call_id : V.FunCallId.id)
let rec translate_sty (ty : T.sty) : ty =
let translate = translate_sty in
match ty with
- | T.Adt (type_id, regions, tys) -> (
+ | T.Adt (type_id, regions, tys, cgs) -> (
(* Can't translate types with regions for now *)
assert (regions = []);
let tys = List.map translate tys in
match type_id with
- | T.AdtId adt_id -> Adt (AdtId adt_id, tys)
+ | T.AdtId adt_id -> Adt (AdtId adt_id, tys, cgs)
| T.Tuple -> mk_simpl_tuple_ty tys
| T.Assumed aty -> (
match aty with
- | T.Vec -> Adt (Assumed Vec, tys)
- | T.Option -> Adt (Assumed Option, tys)
+ | T.Vec -> Adt (Assumed Vec, tys, cgs)
+ | T.Option -> Adt (Assumed Option, tys, cgs)
| T.Box -> (
(* Eliminate the boxes *)
match tys with
@@ -399,15 +413,14 @@ let rec translate_sty (ty : T.sty) : ty =
raise
(Failure
"Box/vec/option type with incorrect number of arguments")
- )))
+ )
+ | T.Array -> Adt (Assumed Array, tys, cgs)
+ | T.Slice -> Adt (Assumed Slice, tys, cgs)
+ | T.Str -> Adt (Assumed Str, tys, cgs)
+ | T.Range -> Adt (Assumed Range, tys, cgs)))
| TypeVar vid -> TypeVar vid
- | Bool -> Bool
- | Char -> Char
+ | Literal ty -> Literal ty
| Never -> raise (Failure "Unreachable")
- | Integer int_ty -> Integer int_ty
- | Str -> Str
- | Array ty -> Array (translate ty)
- | Slice ty -> Slice (translate ty)
| Ref (_, rty, _) -> translate rty
let translate_field (f : T.field) : field =
@@ -445,34 +458,49 @@ let translate_type_decl (def : T.type_decl) : type_decl =
(* Can't translate types with regions for now *)
assert (def.region_params = []);
let type_params = def.type_params in
+ let const_generic_params = def.const_generic_params in
let kind = translate_type_decl_kind def.T.kind in
- { def_id; name; type_params; kind }
+ { def_id; name; type_params; const_generic_params; kind }
+
+let translate_type_id (id : T.type_id) : type_id =
+ match id with
+ | AdtId adt_id -> AdtId adt_id
+ | T.Assumed aty ->
+ let aty =
+ match aty with
+ | T.Vec -> Vec
+ | T.Option -> Option
+ | T.Array -> Array
+ | T.Slice -> Slice
+ | T.Str -> Str
+ | T.Range -> Range
+ | T.Box ->
+ (* Boxes have to be eliminated: this type id shouldn't
+ be translated *)
+ raise (Failure "Unreachable")
+ in
+ Assumed aty
+ | T.Tuple -> Tuple
(** Translate a type, seen as an input/output of a forward function
(preserve all borrows, etc.)
*)
-
let rec translate_fwd_ty (type_infos : TA.type_infos) (ty : 'r T.ty) : ty =
let translate = translate_fwd_ty type_infos in
match ty with
- | T.Adt (type_id, regions, tys) -> (
+ | T.Adt (type_id, regions, tys, cgs) -> (
(* Can't translate types with regions for now *)
assert (regions = []);
(* Translate the type parameters *)
let t_tys = List.map translate tys in
(* Eliminate boxes and simplify tuples *)
match type_id with
- | AdtId _ | T.Assumed (T.Vec | T.Option) ->
+ | AdtId _
+ | T.Assumed (T.Vec | T.Option | T.Array | T.Slice | T.Str | T.Range) ->
(* No general parametricity for now *)
assert (not (List.exists (TypesUtils.ty_has_borrows type_infos) tys));
- let type_id =
- match type_id with
- | AdtId adt_id -> AdtId adt_id
- | T.Assumed T.Vec -> Assumed Vec
- | T.Assumed T.Option -> Assumed Option
- | _ -> raise (Failure "Unreachable")
- in
- Adt (type_id, t_tys)
+ let type_id = translate_type_id type_id in
+ Adt (type_id, t_tys, cgs)
| Tuple ->
(* Note that if there is exactly one type, [mk_simpl_tuple_ty] is the
identity *)
@@ -489,17 +517,8 @@ let rec translate_fwd_ty (type_infos : TA.type_infos) (ty : 'r T.ty) : ty =
"Unreachable: box/vec/option receives exactly one type \
parameter")))
| TypeVar vid -> TypeVar vid
- | Bool -> Bool
- | Char -> Char
| Never -> raise (Failure "Unreachable")
- | Integer int_ty -> Integer int_ty
- | Str -> Str
- | Array ty ->
- assert (not (TypesUtils.ty_has_borrows type_infos ty));
- Array (translate ty)
- | Slice ty ->
- assert (not (TypesUtils.ty_has_borrows type_infos ty));
- Slice (translate ty)
+ | Literal lty -> Literal lty
| Ref (_, rty, _) -> translate rty
(** Simply calls [translate_fwd_ty] *)
@@ -519,21 +538,16 @@ let rec translate_back_ty (type_infos : TA.type_infos)
(* A small helper for "leave" types *)
let wrap ty = if inside_mut then Some ty else None in
match ty with
- | T.Adt (type_id, _, tys) -> (
+ | T.Adt (type_id, _, tys, cgs) -> (
match type_id with
- | T.AdtId _ | Assumed (T.Vec | T.Option) ->
+ | T.AdtId _
+ | Assumed (T.Vec | T.Option | T.Array | T.Slice | T.Str | T.Range) ->
(* Don't accept ADTs (which are not tuples) with borrows for now *)
assert (not (TypesUtils.ty_has_borrows type_infos ty));
- let type_id =
- match type_id with
- | T.AdtId id -> AdtId id
- | T.Assumed T.Vec -> Assumed Vec
- | T.Assumed T.Option -> Assumed Option
- | T.Tuple | T.Assumed T.Box -> raise (Failure "Unreachable")
- in
+ let type_id = translate_type_id type_id in
if inside_mut then
let tys_t = List.filter_map translate tys in
- Some (Adt (type_id, tys_t))
+ Some (Adt (type_id, tys_t, cgs))
else None
| Assumed T.Box -> (
(* Don't accept ADTs (which are not tuples) with borrows for now *)
@@ -555,17 +569,8 @@ let rec translate_back_ty (type_infos : TA.type_infos)
* is the identity *)
Some (mk_simpl_tuple_ty tys_t)))
| TypeVar vid -> wrap (TypeVar vid)
- | Bool -> wrap Bool
- | Char -> wrap Char
| Never -> raise (Failure "Unreachable")
- | Integer int_ty -> wrap (Integer int_ty)
- | Str -> wrap Str
- | Array ty -> (
- assert (not (TypesUtils.ty_has_borrows type_infos ty));
- match translate ty with None -> None | Some ty -> Some (Array ty))
- | Slice ty -> (
- assert (not (TypesUtils.ty_has_borrows type_infos ty));
- match translate ty with None -> None | Some ty -> Some (Slice ty))
+ | Literal lty -> wrap (Literal lty)
| Ref (r, rty, rkind) -> (
match rkind with
| T.Shared ->
@@ -801,8 +806,9 @@ let translate_fun_sig (fun_infos : FA.fun_info A.FunDeclId.Map.t)
(* Wrap in a result type *)
if effect_info.can_fail then mk_result_ty output else output
in
- (* Type parameters *)
+ (* Type/const generic parameters *)
let type_params = sg.type_params in
+ let const_generic_params = sg.const_generic_params in
(* Return *)
let has_fuel = fuel <> [] in
let num_fwd_inputs_no_state = List.length fwd_inputs in
@@ -830,7 +836,9 @@ let translate_fun_sig (fun_infos : FA.fun_info A.FunDeclId.Map.t)
effect_info;
}
in
- let sg = { type_params; inputs; output; doutputs; info } in
+ let sg =
+ { type_params; const_generic_params; inputs; output; doutputs; info }
+ in
{ sg; output_names }
let bs_ctx_fresh_state_var (ctx : bs_ctx) : bs_ctx * typed_pattern =
@@ -909,7 +917,7 @@ let lookup_var_for_symbolic_value (sv : V.symbolic_value) (ctx : bs_ctx) : var =
(** Peel boxes as long as the value is of the form [Box<T>] *)
let rec unbox_typed_value (v : V.typed_value) : V.typed_value =
match (v.value, v.ty) with
- | V.Adt av, T.Adt (T.Assumed T.Box, _, _) -> (
+ | V.Adt av, T.Adt (T.Assumed T.Box, _, _, _) -> (
match av.field_values with
| [ bv ] -> unbox_typed_value bv
| _ -> raise (Failure "Unreachable"))
@@ -948,26 +956,22 @@ let rec typed_value_to_texpression (ctx : bs_ctx) (ectx : C.eval_ctx)
(* Translate the value *)
let value =
match v.value with
- | V.Primitive cv -> { e = Const cv; ty }
+ | V.Literal cv -> { e = Const cv; ty }
| Adt av -> (
let variant_id = av.variant_id in
let field_values = List.map translate av.field_values in
(* Eliminate the tuple wrapper if it is a tuple with exactly one field *)
match v.ty with
- | T.Adt (T.Tuple, _, _) ->
+ | T.Adt (T.Tuple, _, _, _) ->
assert (variant_id = None);
mk_simpl_tuple_texpression field_values
| _ ->
- (* Retrieve the type and the translated type arguments from the
- * translated type (simpler this way) *)
- let adt_id, type_args =
- match ty with
- | Adt (type_id, tys) -> (type_id, tys)
- | _ -> raise (Failure "Unreachable")
- in
+ (* Retrieve the type, the translated type arguments and the
+ * const generic arguments from the translated type (simpler this way) *)
+ let adt_id, type_args, const_generic_args = ty_as_adt ty in
(* Create the constructor *)
let qualif_id = AdtCons { adt_id; variant_id = av.variant_id } in
- let qualif = { id = qualif_id; type_args } in
+ let qualif = { id = qualif_id; type_args; const_generic_args } in
let cons_e = Qualif qualif in
let field_tys =
List.map (fun (v : texpression) -> v.ty) field_values
@@ -1034,9 +1038,11 @@ let rec typed_avalue_to_consumed (ctx : bs_ctx) (ectx : C.eval_ctx)
(* Translate the field values *)
let field_values = List.filter_map translate adt_v.field_values in
(* For now, only tuples can contain borrows *)
- let adt_id, _, _ = TypesUtils.ty_as_adt av.ty in
+ let adt_id, _, _, _ = TypesUtils.ty_as_adt av.ty in
match adt_id with
- | T.AdtId _ | T.Assumed (T.Box | T.Vec | T.Option) ->
+ | T.AdtId _
+ | T.Assumed
+ (T.Box | T.Vec | T.Option | T.Array | T.Slice | T.Str | T.Range) ->
assert (field_values = []);
None
| T.Tuple ->
@@ -1177,11 +1183,13 @@ let rec typed_avalue_to_given_back (mp : mplace option) (av : V.typed_avalue)
in
let field_values = List.filter_map (fun x -> x) field_values in
(* For now, only tuples can contain borrows - note that if we gave
- * something like a [&mut Vec] to a function, we give give back the
+ * something like a [&mut Vec] to a function, we give back the
* vector value upon visiting the "abstraction borrow" node *)
- let adt_id, _, _ = TypesUtils.ty_as_adt av.ty in
+ let adt_id, _, _, _ = TypesUtils.ty_as_adt av.ty in
match adt_id with
- | T.AdtId _ | T.Assumed (T.Box | T.Vec | T.Option) ->
+ | T.AdtId _
+ | T.Assumed
+ (T.Box | T.Vec | T.Option | T.Array | T.Slice | T.Str | T.Range) ->
assert (field_values = []);
(ctx, None)
| T.Tuple ->
@@ -1451,6 +1459,7 @@ and translate_function_call (call : S.call) (e : S.expression) (ctx : bs_ctx) :
texpression =
(* Translate the function call *)
let type_args = List.map (ctx_translate_fwd_ty ctx) call.type_params in
+ let const_generic_args = call.const_generic_params in
let args =
let args = List.map (typed_value_to_texpression ctx call.ctx) call.args in
let args_mplaces = List.map translate_opt_mplace call.args_places in
@@ -1552,7 +1561,7 @@ and translate_function_call (call : S.call) (e : S.expression) (ctx : bs_ctx) :
| None -> dest
| Some out_state -> mk_simpl_tuple_pattern [ out_state; dest ]
in
- let func = { id = FunOrOp fun_id; type_args } in
+ let func = { id = FunOrOp fun_id; type_args; const_generic_args } in
let input_tys = (List.map (fun (x : texpression) -> x.ty)) args in
let ret_ty =
if effect_info.can_fail then mk_result_ty dest_v.ty else dest_v.ty
@@ -1613,13 +1622,13 @@ and translate_end_abstraction_synth_input (ectx : C.eval_ctx) (abs : V.abs)
* to the backward function, and which consumed the values [consumed_i],
* we introduce:
* {[
- * let v_i = consumed_i in
- * ...
- * ]}
+ * let v_i = consumed_i in
+ * ...
+ * ]}
* Then, when we reach the [Return] node, we introduce:
* {[
- * (v_i)
- * ]}
+ * (v_i)
+ * ]}
* *)
(* First, get the given back variables.
@@ -1684,6 +1693,7 @@ and translate_end_abstraction_fun_call (ectx : C.eval_ctx) (abs : V.abs)
get_fun_effect_info ctx.fun_context.fun_infos fun_id None (Some rg_id)
in
let type_args = List.map (ctx_translate_fwd_ty ctx) call.type_params in
+ let const_generic_args = call.const_generic_params in
(* Retrieve the original call and the parent abstractions *)
let _forward, backwards = get_abs_ancestors ctx abs call_id in
(* Retrieve the values consumed when we called the forward function and
@@ -1732,7 +1742,10 @@ and translate_end_abstraction_fun_call (ectx : C.eval_ctx) (abs : V.abs)
in
(* Sanity check: there is the proper number of inputs and outputs, and they have the proper type *)
let _ =
- let inst_sg = get_instantiated_fun_sig fun_id (Some rg_id) type_args ctx in
+ let inst_sg =
+ get_instantiated_fun_sig fun_id (Some rg_id) type_args const_generic_args
+ ctx
+ in
log#ldebug
(lazy
("\n- fun_id: " ^ A.show_fun_id fun_id ^ "\n- inputs ("
@@ -1775,7 +1788,7 @@ and translate_end_abstraction_fun_call (ectx : C.eval_ctx) (abs : V.abs)
if effect_info.can_fail then mk_result_ty output.ty else output.ty
in
let func_ty = mk_arrows input_tys ret_ty in
- let func = { id = FunOrOp func; type_args } in
+ let func = { id = FunOrOp func; type_args; const_generic_args } in
let func = { e = Qualif func; ty = func_ty } in
let call = mk_apps func args in
(* **Optimization**:
@@ -1838,7 +1851,7 @@ and translate_end_abstraction_synth_ret (ectx : C.eval_ctx) (abs : V.abs)
{[
let id_back x nx =
let s = nx in // the name [s] is not important (only collision matters)
- ...
+ ...
]}
This let-binding later gets inlined, during a micro-pass.
@@ -1899,6 +1912,7 @@ and translate_end_abstraction_loop (ectx : C.eval_ctx) (abs : V.abs)
in
let loop_info = LoopId.Map.find loop_id ctx.loops in
let type_args = loop_info.type_args in
+ let const_generic_args = loop_info.const_generic_args in
let fwd_inputs = Option.get loop_info.forward_inputs in
(* Retrieve the additional backward inputs. Note that those are actually
the backward inputs of the function we are synthesizing (and that we
@@ -1947,7 +1961,7 @@ and translate_end_abstraction_loop (ectx : C.eval_ctx) (abs : V.abs)
in
let func_ty = mk_arrows input_tys ret_ty in
let func = Fun (FromLlbc (fun_id, Some loop_id, Some rg_id)) in
- let func = { id = FunOrOp func; type_args } in
+ let func = { id = FunOrOp func; type_args; const_generic_args } in
let func = { e = Qualif func; ty = func_ty } in
let call = mk_apps func args in
(* **Optimization**:
@@ -2007,7 +2021,9 @@ and translate_global_eval (gid : A.GlobalDeclId.id) (sval : V.symbolic_value)
(e : S.expression) (ctx : bs_ctx) : texpression =
let ctx, var = fresh_var_for_symbolic_value sval ctx in
let decl = A.GlobalDeclId.Map.find gid ctx.global_context.llbc_global_decls in
- let global_expr = { id = Global gid; type_args = [] } in
+ let global_expr =
+ { id = Global gid; type_args = []; const_generic_args = [] }
+ in
(* We use translate_fwd_ty to translate the global type *)
let ty = ctx_translate_fwd_ty ctx decl.ty in
let gval = { e = Qualif global_expr; ty } in
@@ -2020,8 +2036,14 @@ and translate_assertion (ectx : C.eval_ctx) (v : V.typed_value)
let monadic = true in
let v = typed_value_to_texpression ctx ectx v in
let args = [ v ] in
- let func = { id = FunOrOp (Fun (Pure Assert)); type_args = [] } in
- let func_ty = mk_arrow Bool mk_unit_ty in
+ let func =
+ {
+ id = FunOrOp (Fun (Pure Assert));
+ type_args = [];
+ const_generic_args = [];
+ }
+ in
+ let func_ty = mk_arrow (Literal Bool) mk_unit_ty in
let func = { e = Qualif func; ty = func_ty } in
let assertion = mk_apps func args in
mk_let monadic (mk_dummy_pattern mk_unit_ty) assertion next_e
@@ -2036,13 +2058,13 @@ and translate_expansion (p : S.mplace option) (sv : V.symbolic_value)
match exp with
| ExpandNoBranch (sexp, e) -> (
match sexp with
- | V.SePrimitive _ ->
- (* Actually, we don't *register* symbolic expansions to constant
- * values in the symbolic ADT *)
+ | V.SeLiteral _ ->
+ (* We do not *register* symbolic expansions to literal
+ * values in the symbolic ADT *)
raise (Failure "Unreachable")
| SeMutRef (_, nsv) | SeSharedRef (_, nsv) ->
(* The (mut/shared) borrow type is extracted to identity: we thus simply
- * introduce an reassignment *)
+ * introduce an reassignment *)
let ctx, var = fresh_var_for_symbolic_value nsv ctx in
let next_e = translate_expression e ctx in
let monadic = false in
@@ -2063,10 +2085,10 @@ and translate_expansion (p : S.mplace option) (sv : V.symbolic_value)
&& !Config.always_deconstruct_adts_with_matches) ->
(* There is exactly one branch: no branching.
- We can decompose the ADT value with a let-binding, unless
- the backend doesn't support this (see {!Config.always_deconstruct_adts_with_matches}):
- we *ignore* this branch (and go to the next one) if the ADT is a custom
- adt, and [always_deconstruct_adts_with_matches] is true.
+ We can decompose the ADT value with a let-binding, unless
+ the backend doesn't support this (see {!Config.always_deconstruct_adts_with_matches}):
+ we *ignore* this branch (and go to the next one) if the ADT is a custom
+ adt, and [always_deconstruct_adts_with_matches] is true.
*)
translate_ExpandAdt_one_branch sv scrutinee scrutinee_mplace
variant_id svl branch ctx
@@ -2115,14 +2137,14 @@ and translate_expansion (p : S.mplace option) (sv : V.symbolic_value)
let translate_branch ((v, branch_e) : V.scalar_value * S.expression) :
match_branch =
(* We don't need to update the context: we don't introduce any
- * new values/variables *)
+ * new values/variables *)
let branch = translate_expression branch_e ctx in
- let pat = mk_typed_pattern_from_primitive_value (PV.Scalar v) in
+ let pat = mk_typed_pattern_from_literal (PV.Scalar v) in
{ pat; branch }
in
let branches = List.map translate_branch branches in
let otherwise = translate_expression otherwise ctx in
- let pat_ty = Integer int_ty in
+ let pat_ty = Literal (Integer int_ty) in
let otherwise_pat : typed_pattern = { value = PatDummy; ty = pat_ty } in
let otherwise : match_branch =
{ pat = otherwise_pat; branch = otherwise }
@@ -2142,18 +2164,18 @@ and translate_expansion (p : S.mplace option) (sv : V.symbolic_value)
There are several possibilities:
- if the ADT is an enumeration, we attempt to deconstruct it with a let-binding:
- {[
- let Cons x0 ... xn = y in
- ...
- ]}
+ {[
+ let Cons x0 ... xn = y in
+ ...
+ ]}
- if the ADT is a structure, we attempt to introduce one let-binding per field:
- {[
- let x0 = y.f0 in
- ...
+ {[
+ let x0 = y.f0 in
+ ...
let xn = y.fn in
...
- ]}
+ ]}
Of course, this is not always possible depending on the backend.
Also, recursive structures, and more specifically structures mutually recursive
@@ -2167,14 +2189,14 @@ and translate_ExpandAdt_one_branch (sv : V.symbolic_value)
(branch : S.expression) (ctx : bs_ctx) : texpression =
(* TODO: always introduce a match, and use micro-passes to turn the
the match into a let? *)
- let type_id, _, _ = TypesUtils.ty_as_adt sv.V.sv_ty in
+ let type_id, _, _, _ = TypesUtils.ty_as_adt sv.V.sv_ty in
let ctx, vars = fresh_vars_for_symbolic_values svl ctx in
let branch = translate_expression branch ctx in
match type_id with
| T.AdtId adt_id ->
(* Detect if this is an enumeration or not *)
let tdef = bs_ctx_lookup_llbc_type_decl adt_id ctx in
- let is_enum = type_decl_is_enum tdef in
+ let is_enum = TypesUtils.type_decl_is_enum tdef in
(* We deconstruct the ADT with a let-binding in two situations:
- if the ADT is an enumeration (which must have exactly one branch)
- if we forbid using field projectors.
@@ -2202,14 +2224,10 @@ and translate_ExpandAdt_one_branch (sv : V.symbolic_value)
* field.
* We use the [dest] variable in order not to have to recompute
* the type of the result of the projection... *)
- let adt_id, type_args =
- match scrutinee.ty with
- | Adt (adt_id, tys) -> (adt_id, tys)
- | _ -> raise (Failure "Unreachable")
- in
+ let adt_id, type_args, const_generic_args = ty_as_adt scrutinee.ty in
let gen_field_proj (field_id : FieldId.id) (dest : var) : texpression =
let proj_kind = { adt_id; field_id } in
- let qualif = { id = Proj proj_kind; type_args } in
+ let qualif = { id = Proj proj_kind; type_args; const_generic_args } in
let proj_e = Qualif qualif in
let proj_ty = mk_arrow scrutinee.ty dest.ty in
let proj = { e = proj_e; ty = proj_ty } in
@@ -2241,31 +2259,47 @@ and translate_ExpandAdt_one_branch (sv : V.symbolic_value)
(mk_typed_pattern_from_var var None)
(mk_opt_mplace_texpression scrutinee_mplace scrutinee)
branch
- | T.Assumed T.Vec ->
- (* We can't expand vector values: we can access the fields only
+ | T.Assumed (T.Vec | T.Array | T.Slice | T.Str) ->
+ (* We can't expand those values: we can access the fields only
* through the functions provided by the API (note that we don't
- * know how to expand a vector, because it has a variable number
+ * know how to expand values like vectors or arrays, because they have a variable number
* of fields!) *)
- raise (Failure "Can't expand a vector value")
+ raise (Failure "Attempt to expand a non-expandable value")
+ | T.Assumed Range -> raise (Failure "Unimplemented")
| T.Assumed T.Option ->
(* We shouldn't get there in the "one-branch" case: options have
* two variants *)
raise (Failure "Unreachable")
and translate_intro_symbolic (ectx : C.eval_ctx) (p : S.mplace option)
- (sv : V.symbolic_value) (v : V.typed_value) (e : S.expression)
+ (sv : V.symbolic_value) (v : S.value_aggregate) (e : S.expression)
(ctx : bs_ctx) : texpression =
let mplace = translate_opt_mplace p in
(* Introduce a fresh variable for the symbolic value *)
let ctx, var = fresh_var_for_symbolic_value sv ctx in
- (* Translate the value *)
- let v = typed_value_to_texpression ctx ectx v in
-
(* Translate the next expression *)
let next_e = translate_expression e ctx in
+ (* Translate the value: there are two cases, depending on whether this
+ is a "regular" let-binding or an array aggregate.
+ *)
+ let v =
+ match v with
+ | SingleValue v -> typed_value_to_texpression ctx ectx v
+ | Array values ->
+ (* We use a struct update to encode the array aggregate, in order
+ to preserve the structure and allow generating code of the shape
+ `[x0, ...., xn]` *)
+ let values = List.map (typed_value_to_texpression ctx ectx) values in
+ let values = FieldId.mapi (fun fid v -> (fid, v)) values in
+ let su : struct_update =
+ { struct_id = Assumed Array; init = None; updates = values }
+ in
+ { e = StructUpdate su; ty = var.ty }
+ in
+
(* Make the let-binding *)
let monadic = false in
let var = mk_typed_pattern_from_var var mplace in
@@ -2382,7 +2416,13 @@ and translate_forward_end (ectx : C.eval_ctx)
let loop_call =
let fun_id = Fun (FromLlbc (fid, Some loop_id, None)) in
- let func = { id = FunOrOp fun_id; type_args = loop_info.type_args } in
+ let func =
+ {
+ id = FunOrOp fun_id;
+ type_args = loop_info.type_args;
+ const_generic_args = loop_info.const_generic_args;
+ }
+ in
let input_tys = (List.map (fun (x : texpression) -> x.ty)) args in
let ret_ty =
if effect_info.can_fail then mk_result_ty out_pat.ty else out_pat.ty
@@ -2503,7 +2543,12 @@ and translate_loop (loop : S.loop) (ctx : bs_ctx) : texpression =
(and will introduce the outputs at that moment, together with the actual
call to the loop forward function *)
let type_args =
- List.map (fun ty -> TypeVar ty.T.index) ctx.sg.type_params
+ List.map (fun (ty : T.type_var) -> TypeVar ty.T.index) ctx.sg.type_params
+ in
+ let const_generic_args =
+ List.map
+ (fun (cg : T.const_generic_var) -> T.ConstGenericVar cg.T.index)
+ ctx.sg.const_generic_params
in
let loop_info =
@@ -2512,6 +2557,7 @@ and translate_loop (loop : S.loop) (ctx : bs_ctx) : texpression =
input_vars = inputs;
input_svl = loop.input_svalues;
type_args;
+ const_generic_args;
forward_inputs = None;
forward_output_no_state_no_result = None;
}
@@ -2599,14 +2645,26 @@ let wrap_in_match_fuel (fuel0 : VarId.id) (fuel : VarId.id) (body : texpression)
*)
(* Create the expression: [fuel0 = 0] *)
let check_fuel =
- let func = { id = FunOrOp (Fun (Pure FuelEqZero)); type_args = [] } in
+ let func =
+ {
+ id = FunOrOp (Fun (Pure FuelEqZero));
+ type_args = [];
+ const_generic_args = [];
+ }
+ in
let func_ty = mk_arrow mk_fuel_ty mk_bool_ty in
let func = { e = Qualif func; ty = func_ty } in
mk_app func fuel0
in
(* Create the expression: [decrease fuel0] *)
let decrease_fuel =
- let func = { id = FunOrOp (Fun (Pure FuelDecrease)); type_args = [] } in
+ let func =
+ {
+ id = FunOrOp (Fun (Pure FuelDecrease));
+ type_args = [];
+ const_generic_args = [];
+ }
+ in
let func_ty = mk_arrow mk_fuel_ty mk_fuel_ty in
let func = { e = Qualif func; ty = func_ty } in
mk_app func fuel0
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 14:22:00 +0000