Index: llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
--- llvm/lib/Target/AArch64/AArch64FrameLowering.cpp.orig
+++ llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
@@ -189,6 +189,7 @@
 #include "AArch64InstrInfo.h"
 #include "AArch64MachineFunctionInfo.h"
 #include "AArch64RegisterInfo.h"
+#include "AArch64ReturnProtectorLowering.h"
 #include "AArch64Subtarget.h"
 #include "AArch64TargetMachine.h"
 #include "MCTargetDesc/AArch64AddressingModes.h"
@@ -3037,6 +3038,10 @@ void AArch64FrameLowering::determineCalleeSaves(Machin
                                 ? RegInfo->getBaseRegister()
                                 : (unsigned)AArch64::NoRegister;
 
+  if (MFI.hasReturnProtectorRegister() && MFI.getReturnProtectorNeedsStore()) {
+    SavedRegs.set(MFI.getReturnProtectorRegister());
+  }
+
   unsigned ExtraCSSpill = 0;
   // Figure out which callee-saved registers to save/restore.
   for (unsigned i = 0; CSRegs[i]; ++i) {
@@ -3864,6 +3869,10 @@ unsigned AArch64FrameLowering::getWinEHFuncletFrameSiz
   // This is the amount of stack a funclet needs to allocate.
   return alignTo(CSSize + MF.getFrameInfo().getMaxCallFrameSize(),
                  getStackAlign());
+}
+
+const ReturnProtectorLowering *AArch64FrameLowering::getReturnProtector() const {
+  return &RPL;
 }
 
 namespace {
