No subject

[matze at braunis.de]

>From 667dbfe63833150c23efc20e079d22fe78e7fca8 Mon Sep 17 00:00:00 2001
Message-Id: <667dbfe63833150c23efc20e079d22fe78e7fca8.1377816463.git.matze at braunis.de>
In-Reply-To: <02d89dcc988d30d6b07e999ebfde0a81592c0dcb.1377816463.git.matze at braunis.de>
References: <02d89dcc988d30d6b07e999ebfde0a81592c0dcb.1377816463.git.matze at braunis.de>
From: Matthias Braun <matze at braunis.de>
Date: Tue, 6 Aug 2013 19:25:47 -0700
Subject: [PATCH 4/5] remove unused argument from LiveRanges::join()
To: llvm-commits at cs.uiuc.edu

---
 include/llvm/CodeGen/LiveInterval.h | 3 +--
 lib/CodeGen/LiveInterval.cpp        | 3 +--
 lib/CodeGen/RegisterCoalescer.cpp   | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/llvm/CodeGen/LiveInterval.h b/include/llvm/CodeGen/LiveInterval.h
index 0d27582..db034fe 100644
--- a/include/llvm/CodeGen/LiveInterval.h
+++ b/include/llvm/CodeGen/LiveInterval.h
@@ -378,8 +378,7 @@ namespace llvm {
     void join(LiveInterval &Other,
               const int *ValNoAssignments,
               const int *RHSValNoAssignments,
-              SmallVectorImpl<VNInfo *> &NewVNInfo,
-              MachineRegisterInfo *MRI);
+              SmallVectorImpl<VNInfo *> &NewVNInfo);
 
     /// True iff this live range is a single segment that lies between the
     /// specified boundaries, exclusively. Vregs live across a backedge are not
diff --git a/lib/CodeGen/LiveInterval.cpp b/lib/CodeGen/LiveInterval.cpp
index 3f88236..e067add 100644
--- a/lib/CodeGen/LiveInterval.cpp
+++ b/lib/CodeGen/LiveInterval.cpp
@@ -415,8 +415,7 @@ void LiveInterval::removeValNo(VNInfo *ValNo) {
 void LiveInterval::join(LiveInterval &Other,
                         const int *LHSValNoAssignments,
                         const int *RHSValNoAssignments,
-                        SmallVectorImpl<VNInfo *> &NewVNInfo,
-                        MachineRegisterInfo *MRI) {
+                        SmallVectorImpl<VNInfo *> &NewVNInfo) {
   verify();
 
   // Determine if any of our live range values are mapped.  This is uncommon, so
diff --git a/lib/CodeGen/RegisterCoalescer.cpp b/lib/CodeGen/RegisterCoalescer.cpp
index 7bfb54d..fefe33a 100644
--- a/lib/CodeGen/RegisterCoalescer.cpp
+++ b/lib/CodeGen/RegisterCoalescer.cpp
@@ -1999,8 +1999,7 @@ bool RegisterCoalescer::joinVirtRegs(CoalescerPair &CP) {
     LIS->shrinkToUses(&LIS->getInterval(ShrinkRegs.pop_back_val()));
 
   // Join RHS into LHS.
-  LHS.join(RHS, LHSVals.getAssignments(), RHSVals.getAssignments(), NewVNInfo,
-           MRI);
+  LHS.join(RHS, LHSVals.getAssignments(), RHSVals.getAssignments(), NewVNInfo);
 
   // Kill flags are going to be wrong if the live ranges were overlapping.
   // Eventually, we should simply clear all kill flags when computing live
-- 
1.8.3.4