From 3a128ca0e1da952fa9cffcb4a4ad9cfadc7020d4 Mon Sep 17 00:00:00 2001 From: Leo White Date: Wed, 17 Feb 2021 13:52:42 +0000 Subject: Remove unused labels --- middle_end/closure/closure_middle_end.ml | 2 +- middle_end/closure/closure_middle_end.mli | 1 - middle_end/flambda/closure_conversion.ml | 4 +--- middle_end/flambda/closure_conversion.mli | 1 - middle_end/flambda/flambda_middle_end.ml | 7 +++---- middle_end/flambda/flambda_middle_end.mli | 1 - middle_end/flambda/flambda_to_clambda.ml | 2 -- middle_end/flambda/un_anf.ml | 2 -- 8 files changed, 5 insertions(+), 15 deletions(-) (limited to 'middle_end') diff --git a/middle_end/closure/closure_middle_end.ml b/middle_end/closure/closure_middle_end.ml index cb593eb0ed..0d191fc26c 100644 --- a/middle_end/closure/closure_middle_end.ml +++ b/middle_end/closure/closure_middle_end.ml @@ -29,7 +29,7 @@ let raw_clambda_dump_if ppf end; if !Clflags.dump_cmm then Format.fprintf ppf "@.cmm:@." -let lambda_to_clambda ~backend ~filename:_ ~prefixname:_ ~ppf_dump +let lambda_to_clambda ~backend ~prefixname:_ ~ppf_dump (lambda : Lambda.program) = let clambda = Closure.intro ~backend ~size:lambda.main_module_block_size lambda.code diff --git a/middle_end/closure/closure_middle_end.mli b/middle_end/closure/closure_middle_end.mli index e0ebb1decf..35cec165e7 100644 --- a/middle_end/closure/closure_middle_end.mli +++ b/middle_end/closure/closure_middle_end.mli @@ -15,7 +15,6 @@ val lambda_to_clambda : backend:(module Backend_intf.S) - -> filename:string -> prefixname:string -> ppf_dump:Format.formatter -> Lambda.program diff --git a/middle_end/flambda/closure_conversion.ml b/middle_end/flambda/closure_conversion.ml index 88132ddf15..350bf102ca 100644 --- a/middle_end/flambda/closure_conversion.ml +++ b/middle_end/flambda/closure_conversion.ml @@ -28,7 +28,6 @@ let name_expr_from_var = Flambda_utils.name_expr_from_var type t = { current_unit_id : Ident.t; symbol_for_global' : (Ident.t -> Symbol.t); - filename : string; backend : (module Backend_intf.S); mutable imported_symbols : Symbol.Set.t; mutable declared_symbols : (Symbol.t * Flambda.constant_defining_value) list; @@ -682,7 +681,7 @@ and close_let_bound_expression t ?let_rec_ident let_bound_var env ~var:let_bound_var)) | lam -> Expr (close t env lam) -let lambda_to_flambda ~backend ~module_ident ~size ~filename lam +let lambda_to_flambda ~backend ~module_ident ~size lam : Flambda.program = let lam = add_default_argument_wrappers lam in let module Backend = (val backend : Backend_intf.S) in @@ -690,7 +689,6 @@ let lambda_to_flambda ~backend ~module_ident ~size ~filename lam let t = { current_unit_id = Compilation_unit.get_persistent_ident compilation_unit; symbol_for_global' = Backend.symbol_for_global'; - filename; backend; imported_symbols = Symbol.Set.empty; declared_symbols = []; diff --git a/middle_end/flambda/closure_conversion.mli b/middle_end/flambda/closure_conversion.mli index f5fab0a7ed..67b57145fe 100644 --- a/middle_end/flambda/closure_conversion.mli +++ b/middle_end/flambda/closure_conversion.mli @@ -48,6 +48,5 @@ val lambda_to_flambda : backend:(module Backend_intf.S) -> module_ident:Ident.t -> size:int - -> filename:string -> Lambda.lambda -> Flambda.program diff --git a/middle_end/flambda/flambda_middle_end.ml b/middle_end/flambda/flambda_middle_end.ml index 0675855f82..6af32ecb90 100644 --- a/middle_end/flambda/flambda_middle_end.ml +++ b/middle_end/flambda/flambda_middle_end.ml @@ -31,7 +31,7 @@ let _dump_function_sizes flam ~backend = | None -> assert false) set_of_closures.function_decls.funs) -let lambda_to_flambda ~ppf_dump ~prefixname ~backend ~size ~filename +let lambda_to_flambda ~ppf_dump ~prefixname ~backend ~size ~module_ident ~module_initializer = Profile.record_call "flambda" (fun () -> let previous_warning_reporter = !Location.warning_reporter in @@ -83,7 +83,7 @@ let lambda_to_flambda ~ppf_dump ~prefixname ~backend ~size ~filename (fun () -> module_initializer |> Closure_conversion.lambda_to_flambda ~backend - ~module_ident ~size ~filename) + ~module_ident ~size) in if !Clflags.dump_rawflambda then @@ -212,12 +212,11 @@ let flambda_raw_clambda_dump_if ppf if !Clflags.dump_cmm then Format.fprintf ppf "@.cmm:@."; input -let lambda_to_clambda ~backend ~filename ~prefixname ~ppf_dump +let lambda_to_clambda ~backend ~prefixname ~ppf_dump (program : Lambda.program) = let program = lambda_to_flambda ~ppf_dump ~prefixname ~backend ~size:program.main_module_block_size - ~filename ~module_ident:program.module_ident ~module_initializer:program.code in diff --git a/middle_end/flambda/flambda_middle_end.mli b/middle_end/flambda/flambda_middle_end.mli index e7bb7478b5..6498bf94ad 100644 --- a/middle_end/flambda/flambda_middle_end.mli +++ b/middle_end/flambda/flambda_middle_end.mli @@ -20,7 +20,6 @@ val lambda_to_clambda : backend:(module Backend_intf.S) - -> filename:string -> prefixname:string -> ppf_dump:Format.formatter -> Lambda.program diff --git a/middle_end/flambda/flambda_to_clambda.ml b/middle_end/flambda/flambda_to_clambda.ml index 6b4fae2462..53fd96ff2f 100644 --- a/middle_end/flambda/flambda_to_clambda.ml +++ b/middle_end/flambda/flambda_to_clambda.ml @@ -140,7 +140,6 @@ end = struct { subst : Clambda.ulambda Variable.Map.t; var : V.t Variable.Map.t; mutable_var : V.t Mutable_variable.Map.t; - toplevel : bool; allocated_constant_for_symbol : Allocated_const.t Symbol.Map.t; } @@ -148,7 +147,6 @@ end = struct { subst = Variable.Map.empty; var = Variable.Map.empty; mutable_var = Mutable_variable.Map.empty; - toplevel = false; allocated_constant_for_symbol = Symbol.Map.empty; } diff --git a/middle_end/flambda/un_anf.ml b/middle_end/flambda/un_anf.ml index 7ce8d29934..a3a5f10a58 100644 --- a/middle_end/flambda/un_anf.ml +++ b/middle_end/flambda/un_anf.ml @@ -37,7 +37,6 @@ type var_info = linear_let_bound_vars : V.Set.t; assigned : V.Set.t; closure_environment : V.Set.t; - let_bound_vars_that_can_be_moved : V.Set.t; } let ignore_uconstant (_ : Clambda.uconstant) = () @@ -244,7 +243,6 @@ let make_var_info (clam : Clambda.ulambda) : var_info = in { used_let_bound_vars; linear_let_bound_vars; assigned; closure_environment = !environment_vars; - let_bound_vars_that_can_be_moved = V.Set.empty; } (* When sequences of [let]-bindings match the evaluation order in a subsequent -- cgit v1.2.1