From e83a27516cf5b6cc92ead99c17bbd77bca7ae06b Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Mon, 25 Feb 2008 19:24:01 +0000 Subject: [PATCH] All remat'ed loads cannot be folded into two-address code. Not just argument loads. This change doesn't really have any impact on codegen. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47557 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/LiveIntervalAnalysis.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index a13bc43a5ef..716c3701102 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -789,7 +789,7 @@ bool LiveIntervals::tryFoldMemoryOperand(MachineInstr* &MI, /// folding is possible. bool LiveIntervals::canFoldMemoryOperand(MachineInstr *MI, SmallVector &Ops, - bool ReMatLoadSS) const { + bool ReMatLoad) const { // Filter the list of operand indexes that are to be folded. Abort if // any operand will prevent folding. unsigned MRInfo = 0; @@ -797,8 +797,8 @@ bool LiveIntervals::canFoldMemoryOperand(MachineInstr *MI, if (FilterFoldedOps(MI, Ops, MRInfo, FoldOps)) return false; - // Can't fold a load from fixed stack slot into a two address instruction. - if (ReMatLoadSS && (MRInfo & VirtRegMap::isMod)) + // Can't fold a remat'ed load into a two address instruction. + if (ReMatLoad && (MRInfo & VirtRegMap::isMod)) return false; return tii_->canFoldMemoryOperand(MI, FoldOps); @@ -951,7 +951,7 @@ rewriteInstructionForSpills(const LiveInterval &li, const VNInfo *VNI, goto RestartInstruction; } } else { - CanFold = canFoldMemoryOperand(MI, Ops, DefIsReMat && isLoadSS); + CanFold = canFoldMemoryOperand(MI, Ops, DefIsReMat && isLoad); } } else CanFold = false; -- 2.34.1