From 06bbd3e39373fa2a84ef0ef8cfb91dc9602ad245 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Fri, 28 Sep 2018 23:19:15 -0700
Subject: [PATCH] Pass the target isa when printing a function as a string.

This allows encodings and register names to be printed correctly.
---
 lib/filetests/src/test_dce.rs        | 2 +-
 lib/filetests/src/test_licm.rs       | 2 +-
 lib/filetests/src/test_postopt.rs    | 2 +-
 lib/filetests/src/test_preopt.rs     | 2 +-
 lib/filetests/src/test_shrink.rs     | 2 +-
 lib/filetests/src/test_simple_gvn.rs | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/filetests/src/test_dce.rs b/lib/filetests/src/test_dce.rs
index e5a4e79f98..6c1645d5fc 100644
--- a/lib/filetests/src/test_dce.rs
+++ b/lib/filetests/src/test_dce.rs
@@ -41,7 +41,7 @@ impl SubTest for TestDCE {
             .dce(context.flags_or_isa())
             .map_err(|e| pretty_error(&comp_ctx.func, context.isa, Into::into(e)))?;
 
-        let text = comp_ctx.func.to_string();
+        let text = comp_ctx.func.display(context.isa).to_string();
         run_filecheck(&text, context)
     }
 }
diff --git a/lib/filetests/src/test_licm.rs b/lib/filetests/src/test_licm.rs
index 149cf788cf..57523cdf59 100644
--- a/lib/filetests/src/test_licm.rs
+++ b/lib/filetests/src/test_licm.rs
@@ -41,7 +41,7 @@ impl SubTest for TestLICM {
             .licm(context.flags_or_isa())
             .map_err(|e| pretty_error(&comp_ctx.func, context.isa, Into::into(e)))?;
 
-        let text = comp_ctx.func.to_string();
+        let text = comp_ctx.func.display(context.isa).to_string();
         run_filecheck(&text, context)
     }
 }
diff --git a/lib/filetests/src/test_postopt.rs b/lib/filetests/src/test_postopt.rs
index 248528c2b6..4789fd00c7 100644
--- a/lib/filetests/src/test_postopt.rs
+++ b/lib/filetests/src/test_postopt.rs
@@ -38,7 +38,7 @@ impl SubTest for TestPostopt {
             .postopt(isa)
             .map_err(|e| pretty_error(&comp_ctx.func, context.isa, Into::into(e)))?;
 
-        let text = comp_ctx.func.to_string();
+        let text = comp_ctx.func.display(isa).to_string();
         run_filecheck(&text, context)
     }
 }
diff --git a/lib/filetests/src/test_preopt.rs b/lib/filetests/src/test_preopt.rs
index 7e4ae15db7..86f8f87de7 100644
--- a/lib/filetests/src/test_preopt.rs
+++ b/lib/filetests/src/test_preopt.rs
@@ -38,7 +38,7 @@ impl SubTest for TestPreopt {
             .preopt(isa)
             .map_err(|e| pretty_error(&comp_ctx.func, context.isa, Into::into(e)))?;
 
-        let text = &comp_ctx.func.to_string();
+        let text = &comp_ctx.func.display(isa).to_string();
         run_filecheck(&text, context)
     }
 }
diff --git a/lib/filetests/src/test_shrink.rs b/lib/filetests/src/test_shrink.rs
index 69eaabc007..7d909c6187 100644
--- a/lib/filetests/src/test_shrink.rs
+++ b/lib/filetests/src/test_shrink.rs
@@ -40,7 +40,7 @@ impl SubTest for TestShrink {
             .shrink_instructions(isa)
             .map_err(|e| pretty_error(&comp_ctx.func, context.isa, Into::into(e)))?;
 
-        let text = comp_ctx.func.to_string();
+        let text = comp_ctx.func.display(isa).to_string();
         run_filecheck(&text, context)
     }
 }
diff --git a/lib/filetests/src/test_simple_gvn.rs b/lib/filetests/src/test_simple_gvn.rs
index d6d06f49ce..5b664a4f74 100644
--- a/lib/filetests/src/test_simple_gvn.rs
+++ b/lib/filetests/src/test_simple_gvn.rs
@@ -40,7 +40,7 @@ impl SubTest for TestSimpleGVN {
             .simple_gvn(context.flags_or_isa())
             .map_err(|e| pretty_error(&comp_ctx.func, context.isa, Into::into(e)))?;
 
-        let text = comp_ctx.func.to_string();
+        let text = comp_ctx.func.display(context.isa).to_string();
         run_filecheck(&text, context)
     }
 }