diff --git a/llvm/lib/CodeGen/PrologEpilogInserter.cpp b/llvm/lib/CodeGen/PrologEpilogInserter.cpp
index 693bf052a2de..873d2372c563 100644
--- a/llvm/lib/CodeGen/PrologEpilogInserter.cpp
+++ b/llvm/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);