maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Free SavedLI even if SimpleRegisterCoalescing::JoinCopy() returns early. 

llvm-svn: 99113
This commit is contained in:
Jeffrey Yasskin 2010-03-21 01:47:49 +00:00
parent 544cfd76e7
commit 2e4b02d6c1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp
View File

@ -31,6 +31,7 @@
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/SmallSet.h" #include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/Statistic.h" #include "llvm/ADT/Statistic.h"
#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/STLExtras.h"
@ -1639,11 +1640,11 @@ bool SimpleRegisterCoalescing::JoinCopy(CopyRec &TheCopy, bool &Again) {
// Save a copy of the virtual register live interval. We'll manually // Save a copy of the virtual register live interval. We'll manually
// merge this into the "real" physical register live interval this is // merge this into the "real" physical register live interval this is
// coalesced with. // coalesced with.
LiveInterval *SavedLI = 0; OwningPtr<LiveInterval> SavedLI;
if (RealDstReg) if (RealDstReg)
SavedLI = li_->dupInterval(&SrcInt); SavedLI.reset(li_->dupInterval(&SrcInt));
else if (RealSrcReg) else if (RealSrcReg)
SavedLI = li_->dupInterval(&DstInt); SavedLI.reset(li_->dupInterval(&DstInt));
// Check if it is necessary to propagate "isDead" property. // Check if it is necessary to propagate "isDead" property.
if (!isExtSubReg && !isInsSubReg && !isSubRegToReg) { if (!isExtSubReg && !isInsSubReg && !isSubRegToReg) {
@ -1853,7 +1854,7 @@ bool SimpleRegisterCoalescing::JoinCopy(CopyRec &TheCopy, bool &Again) {
// Manually deleted the live interval copy. // Manually deleted the live interval copy.
if (SavedLI) { if (SavedLI) {
SavedLI->clear(); SavedLI->clear();
delete SavedLI; SavedLI.reset();
} }
// If resulting interval has a preference that no longer fits because of subreg // If resulting interval has a preference that no longer fits because of subreg