diff --git a/src/inliner.ml b/src/inliner.ml index 87f792b911e763a635d3a16f6af82c15ccaae16e..39912ded1482b5200003f22108927038e41f9962 100644 --- a/src/inliner.ml +++ b/src/inliner.ml @@ -62,7 +62,6 @@ let inline_call orig_expr args reset locals node = assert (reset = None); let assign_inputs = mkeq loc (List.map (fun v -> v.var_id) inputs', args) in - let assign_inputs = Splitting.tuple_split_eq assign_inputs in let expr = expr_of_expr_list loc (List.map (fun v -> mkexpr loc (Expr_ident v.var_id)) outputs') @@ -78,7 +77,7 @@ let inline_call orig_expr args reset locals node = in expr, inputs'@outputs'@locals'@locals, - assign_inputs@eqs', + assign_inputs::eqs', asserts' diff --git a/src/scheduling.ml b/src/scheduling.ml index 2c4e363e28db8047633ab753fd6367684c20389a..0787a36f0a18f5df95e072ea15b9b5470e35cad1 100644 --- a/src/scheduling.ml +++ b/src/scheduling.ml @@ -43,7 +43,7 @@ type schedule_report = (* Checks whether the currently scheduled variable [choice] is an output of a call, possibly among others *) let is_call_output choice g = - List.for_all ExprDep.is_instance_var (IdentDepGraph.succ g choice) + List.exists ExprDep.is_instance_var (IdentDepGraph.succ g choice) (* Adds successors of [v] in graph [g] in [pending] or [frontier] sets, wrt [eq_equiv], then removes [v] from [g]