[llvm] r200095 - Clean up hack which is no longer needed after r198617. No functionality change.

[Evan Cheng]

Author: evancheng
Date: Sat Jan 25 13:51:19 2014
New Revision: 200095

URL: http://llvm.org/viewvc/llvm-project?rev=200095&view=rev
Log:
Clean up hack which is no longer needed after r198617. No functionality change.

Modified:
    llvm/trunk/lib/Target/ARM/ARMBaseRegisterInfo.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMBaseRegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMBaseRegisterInfo.cpp?rev=200095&r1=200094&r2=200095&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMBaseRegisterInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMBaseRegisterInfo.cpp Sat Jan 25 13:51:19 2014
@@ -51,7 +51,7 @@ ARMBaseRegisterInfo::ARMBaseRegisterInfo
 
 const uint16_t*
 ARMBaseRegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const {
-  const uint16_t *RegList = (STI.isTargetIOS() && !STI.isAAPCS_ABI())
+  const uint16_t *RegList = STI.isTargetIOS()
                                 ? CSR_iOS_SaveList
                                 : CSR_AAPCS_SaveList;
 
@@ -86,8 +86,7 @@ ARMBaseRegisterInfo::getCallPreservedMas
   if (CC == CallingConv::GHC)
     // This is academic becase all GHC calls are (supposed to be) tail calls
     return CSR_NoRegs_RegMask;
-  return (STI.isTargetIOS() && !STI.isAAPCS_ABI())
-    ? CSR_iOS_RegMask : CSR_AAPCS_RegMask;
+  return STI.isTargetIOS() ? CSR_iOS_RegMask : CSR_AAPCS_RegMask;
 }
 
 const uint32_t*