From 430a7b0c94bf9b505aedd9c7d977b43010d6c8f1 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Tue, 14 Aug 2007 01:56:58 +0000 Subject: [PATCH] Kill info update bugs. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@41064 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/LiveInterval.cpp | 3 ++- lib/CodeGen/SimpleRegisterCoalescing.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/LiveInterval.cpp b/lib/CodeGen/LiveInterval.cpp index d60c3b1b63f..9697d43bb4d 100644 --- a/lib/CodeGen/LiveInterval.cpp +++ b/lib/CodeGen/LiveInterval.cpp @@ -109,6 +109,7 @@ bool LiveInterval::overlapsFrom(const LiveInterval& other, void LiveInterval::extendIntervalEndTo(Ranges::iterator I, unsigned NewEnd) { assert(I != ranges.end() && "Not a valid interval!"); unsigned ValId = I->ValId; + unsigned OldEnd = I->end; // Search for the first interval that we can't merge with. Ranges::iterator MergeTo = next(I); @@ -123,7 +124,7 @@ void LiveInterval::extendIntervalEndTo(Ranges::iterator I, unsigned NewEnd) { ranges.erase(next(I), MergeTo); // Update kill info. - removeKillForValNum(ValId, I->start, I->end-1); + removeKillForValNum(ValId, OldEnd, I->end-1); // If the newly formed range now touches the range after it and if they have // the same value number, merge the two ranges into one range. diff --git a/lib/CodeGen/SimpleRegisterCoalescing.cpp b/lib/CodeGen/SimpleRegisterCoalescing.cpp index fef2fde32ae..fc88ffed501 100644 --- a/lib/CodeGen/SimpleRegisterCoalescing.cpp +++ b/lib/CodeGen/SimpleRegisterCoalescing.cpp @@ -559,8 +559,8 @@ bool SimpleRegisterCoalescing::SimpleJoin(LiveInterval &LHS, LiveInterval &RHS) // Okay, the final step is to loop over the RHS live intervals, adding them to // the LHS. - LHS.MergeRangesInAsValue(RHS, LHSValNo); LHS.addKillsForValNum(LHSValNo, VNI.kills); + LHS.MergeRangesInAsValue(RHS, LHSValNo); LHS.weight += RHS.weight; if (RHS.preference && !LHS.preference) LHS.preference = RHS.preference;