From 3125431ece5f87576d06d341d9eadbb68b16aac4 Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <public@benj.me>
Date: Wed, 22 Jan 2020 17:25:52 +0100
Subject: [PATCH] Address nits from #1325

---
 cranelift/codegen/src/legalizer/split.rs      |  6 ++--
 .../filetests/legalizer/isplit-bb.clif        | 24 ++++++++++++++++
 .../filetests/verifier/isplit-bb.clif         | 28 -------------------
 3 files changed, 28 insertions(+), 30 deletions(-)
 create mode 100644 cranelift/filetests/filetests/legalizer/isplit-bb.clif
 delete mode 100644 cranelift/filetests/filetests/verifier/isplit-bb.clif

diff --git a/cranelift/codegen/src/legalizer/split.rs b/cranelift/codegen/src/legalizer/split.rs
index 405b18e4f7..727c766d66 100644
--- a/cranelift/codegen/src/legalizer/split.rs
+++ b/cranelift/codegen/src/legalizer/split.rs
@@ -194,8 +194,10 @@ fn perform_repairs(pos: &mut FuncCursor, cfg: &ControlFlowGraph, mut repairs: Ve
                 let inst_ebb = pos.func.layout.inst_ebb(inst).expect("inst in ebb");
 
                 // Insert split values prior to the terminal branch group.
-                let dfg = &pos.func.dfg;
-                let canonical = pos.func.layout.canonical_branch_inst(dfg, inst_ebb);
+                let canonical = pos
+                    .func
+                    .layout
+                    .canonical_branch_inst(&pos.func.dfg, inst_ebb);
                 if let Some(first_branch) = canonical {
                     pos.goto_inst(first_branch);
                 }
diff --git a/cranelift/filetests/filetests/legalizer/isplit-bb.clif b/cranelift/filetests/filetests/legalizer/isplit-bb.clif
new file mode 100644
index 0000000000..10ab41c440
--- /dev/null
+++ b/cranelift/filetests/filetests/legalizer/isplit-bb.clif
@@ -0,0 +1,24 @@
+test legalizer
+target x86_64
+
+function u0:0(i128, i128, i64) -> i128 system_v {
+ebb0(v0: i128, v1: i128, v2: i64):
+    jump ebb1
+
+ebb1:
+    v17 = iadd v0, v1
+    v20 = iadd v1, v17
+    jump ebb79
+
+ebb79:
+    v425 = iconst.i64 0
+    v426 = icmp_imm eq v425, 1
+    brnz v426, ebb80
+    jump ebb85(v20, v17)
+
+ebb80:
+    trap user0
+
+ebb85(v462: i128, v874: i128):
+    trap user0
+}
diff --git a/cranelift/filetests/filetests/verifier/isplit-bb.clif b/cranelift/filetests/filetests/verifier/isplit-bb.clif
deleted file mode 100644
index ba789706a1..0000000000
--- a/cranelift/filetests/filetests/verifier/isplit-bb.clif
+++ /dev/null
@@ -1,28 +0,0 @@
-test compile
-target x86_64
-
-function u0:0(i128, i128, i64) -> i128 system_v {
-    ebb0(v0: i128, v1: i128, v2: i64):
-        trap user0
-
-    ebb1:
-        v10 = iconst.i64 0
-        v11 = iconst.i64 0
-        v17 = iconcat v10, v11
-        v12 = iconst.i64 0
-        v13 = iconst.i64 0 
-        v20 = iconcat v12, v13
-        trap user0
-
-    ebb79:
-        v425 = iconst.i64 0
-        v426 = icmp_imm eq v425, 1
-        brnz v426, ebb80
-        jump ebb85(v20, v17)
-
-    ebb80:
-        trap user0
-
-    ebb85(v462: i128, v874: i128):
-        trap user0
-}