From 5f6c59e63faf0705d4c6e1fbd7a66ffc59b9ae1f Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Tue, 18 Jan 2022 18:58:37 +0100
Subject: [PATCH] Pass only the Function to write_clif_file

---
 src/base.rs         | 12 ++++++------
 src/optimize/mod.rs |  2 +-
 src/pretty_clif.rs  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/base.rs b/src/base.rs
index 5a889734f21..c1c9a08dc5f 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -105,19 +105,19 @@ pub(crate) fn codegen_fn<'tcx>(
 
     fx.constants_cx.finalize(fx.tcx, &mut *fx.module);
 
-    // Store function in context
-    let context = &mut cx.cached_context;
-    context.func = func;
-
     crate::pretty_clif::write_clif_file(
         tcx,
         "unopt",
         module.isa(),
         instance,
-        &context,
+        &func,
         &clif_comments,
     );
 
+    // Store function in context
+    let context = &mut cx.cached_context;
+    context.func = func;
+
     // Verify function
     verify_func(tcx, &clif_comments, &context.func);
 
@@ -156,7 +156,7 @@ pub(crate) fn codegen_fn<'tcx>(
         "opt",
         module.isa(),
         instance,
-        &context,
+        &context.func,
         &clif_comments,
     );
 
diff --git a/src/optimize/mod.rs b/src/optimize/mod.rs
index 61033d85a12..d1f89adb3bb 100644
--- a/src/optimize/mod.rs
+++ b/src/optimize/mod.rs
@@ -15,6 +15,6 @@ pub(crate) fn optimize_function<'tcx>(
 ) {
     // FIXME classify optimizations over opt levels once we have more
 
-    crate::pretty_clif::write_clif_file(tcx, "preopt", isa, instance, &ctx, &*clif_comments);
+    crate::pretty_clif::write_clif_file(tcx, "preopt", isa, instance, &ctx.func, &*clif_comments);
     crate::base::verify_func(tcx, &*clif_comments, &ctx.func);
 }
diff --git a/src/pretty_clif.rs b/src/pretty_clif.rs
index 4dffb89e105..5b77f4ef0c9 100644
--- a/src/pretty_clif.rs
+++ b/src/pretty_clif.rs
@@ -234,7 +234,7 @@ pub(crate) fn write_clif_file<'tcx>(
     postfix: &str,
     isa: &dyn cranelift_codegen::isa::TargetIsa,
     instance: Instance<'tcx>,
-    context: &cranelift_codegen::Context,
+    func: &cranelift_codegen::ir::Function,
     mut clif_comments: &CommentWriter,
 ) {
     write_ir_file(
@@ -245,7 +245,7 @@ pub(crate) fn write_clif_file<'tcx>(
             cranelift_codegen::write::decorate_function(
                 &mut clif_comments,
                 &mut clif,
-                &context.func,
+                func,
             )
             .unwrap();