From f7a0c0de6d73df8f24438234485b7950323b3d44 Mon Sep 17 00:00:00 2001 From: Jim Grosbach Date: Tue, 20 Oct 2009 16:33:57 +0000 Subject: [PATCH] Register re-use for scavenged frame indices must check for re-deginition of the register in the instruction which kills the scavenged value. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@84641 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/PrologEpilogInserter.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/CodeGen/PrologEpilogInserter.cpp b/lib/CodeGen/PrologEpilogInserter.cpp index 693bf052a2d..873d2372c56 100644 --- a/lib/CodeGen/PrologEpilogInserter.cpp +++ b/lib/CodeGen/PrologEpilogInserter.cpp @@ -873,6 +873,10 @@ void PEI::scavengeFrameVirtualRegs(MachineFunction &Fn) { PrevLastUseOp = i; CurrentScratchReg = CurrentVirtReg = 0; havePrevValue = trackingCurrentValue; + // Re-scan the operands of this instruction to catch definitions + // of the scratch register we're using. This is to handle things + // like ldr "r2, [scratch]" where scratch is r2. + i = 0; } } RS->forward(MI); -- 2.34.1