Index: llvm/trunk/include/llvm/Target/TargetRegisterInfo.h
===================================================================
--- llvm/trunk/include/llvm/Target/TargetRegisterInfo.h
+++ llvm/trunk/include/llvm/Target/TargetRegisterInfo.h
@@ -769,7 +769,7 @@
   /// x86, if the frame register is required, the first fixed stack object is
   /// reserved as its spill slot. This tells PEI not to create a new stack frame
   /// object for the given register. It should be called only after
-  /// processFunctionBeforeCalleeSavedScan().
+  /// determineCalleeSaves().
   virtual bool hasReservedSpillSlot(const MachineFunction &MF, unsigned Reg,
                                     int &FrameIdx) const {
     return false;
Index: llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp
===================================================================
--- llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp
+++ llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp
@@ -910,7 +910,7 @@
   unsigned NumFPRSpilled = 0;
   bool ExtraCSSpill = false;
   bool CanEliminateFrame = true;
-  DEBUG(dbgs() << "*** processFunctionBeforeCalleeSavedScan\nUsed CSRs:");
+  DEBUG(dbgs() << "*** determineCalleeSaves\nUsed CSRs:");
   const MCPhysReg *CSRegs = RegInfo->getCalleeSavedRegs(&MF);
 
   // Check pairs of consecutive callee-saved registers.
Index: llvm/trunk/lib/Target/AArch64/AArch64MachineFunctionInfo.h
===================================================================
--- llvm/trunk/lib/Target/AArch64/AArch64MachineFunctionInfo.h
+++ llvm/trunk/lib/Target/AArch64/AArch64MachineFunctionInfo.h
@@ -42,7 +42,7 @@
   unsigned ArgumentStackToRestore;
 
   /// HasStackFrame - True if this function has a stack frame. Set by
-  /// processFunctionBeforeCalleeSavedScan().
+  /// determineCalleeSaves().
   bool HasStackFrame;
 
   /// \brief Amount of stack frame size, not including callee-saved registers.
Index: llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h
===================================================================
--- llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h
+++ llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h
@@ -52,7 +52,7 @@
   unsigned ReturnRegsCount;
 
   /// HasStackFrame - True if this function has a stack frame. Set by
-  /// processFunctionBeforeCalleeSavedScan().
+  /// determineCalleeSaves().
   bool HasStackFrame;
 
   /// RestoreSPFromFP - True if epilogue should restore SP from FP. Set by
Index: llvm/trunk/lib/Target/WebAssembly/WebAssemblyFrameLowering.h
===================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyFrameLowering.h
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyFrameLowering.h
@@ -39,8 +39,8 @@
   bool hasFP(const MachineFunction &MF) const override;
   bool hasReservedCallFrame(const MachineFunction &MF) const override;
 
-  void processFunctionBeforeCalleeSavedScan(MachineFunction &MF,
-                                            RegScavenger *RS) const override;
+  void determineCalleeSaves(MachineFunction &MF, BitVector &SavedRegs,
+                            RegScavenger *RS = nullptr) const override;
 };
 
 } // end namespace llvm
Index: llvm/trunk/lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp
===================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp
@@ -68,7 +68,8 @@
   llvm_unreachable("TODO: implement emitEpilogue");
 }
 
-void WebAssemblyFrameLowering::processFunctionBeforeCalleeSavedScan(
-    MachineFunction &MF, RegScavenger *RS) const {
-  llvm_unreachable("TODO: implement processFunctionBeforeCalleeSavedScan");
+void WebAssemblyFrameLowering::determineCalleeSaves(MachineFunction &MF,
+                                                    BitVector &SavedRegs,
+                                                    RegScavenger *RS) const {
+  llvm_unreachable("TODO: implement determineCalleeSaves");
 }
Index: llvm/trunk/test/CodeGen/AArch64/arm64-spill-lr.ll
===================================================================
--- llvm/trunk/test/CodeGen/AArch64/arm64-spill-lr.ll
+++ llvm/trunk/test/CodeGen/AArch64/arm64-spill-lr.ll
@@ -1,9 +1,9 @@
 ; RUN: llc -mtriple=arm64-apple-ios < %s
 @bar = common global i32 0, align 4
 
-; Leaf function which uses all callee-saved registers and allocates >= 256 bytes on the stack
-; this will cause processFunctionBeforeCalleeSavedScan() to spill LR as an additional scratch
-; register.
+; Leaf function which uses all callee-saved registers and allocates >= 256 bytes
+; on the stack this will cause determineCalleeSaves() to spill LR as an
+; additional scratch register.
 ;
 ; This is a crash-only regression test for rdar://15124582.
 define i32 @foo(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f, i32 %g, i32 %h) nounwind {