[llvm] 624654f - [VE] Migrate to the getMachineMemOperand overload using llvm::Align

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2020-04-07T16:04:54-07:00
New Revision: 624654fd647057dd6c1cdf8799a7605b69716a02

URL: https://github.com/llvm/llvm-project/commit/624654fd647057dd6c1cdf8799a7605b69716a02
DIFF: https://github.com/llvm/llvm-project/commit/624654fd647057dd6c1cdf8799a7605b69716a02.diff

LOG: [VE] Migrate to the getMachineMemOperand overload using llvm::Align

Just delete the deprecated overload because nothing uses it.

Added: 
    

Modified: 
    llvm/include/llvm/CodeGen/MachineFunction.h
    llvm/lib/Target/VE/VEInstrInfo.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/CodeGen/MachineFunction.h b/llvm/include/llvm/CodeGen/MachineFunction.h
index a3e49ceca89d..35b1c7d6caac 100644
--- a/llvm/include/llvm/CodeGen/MachineFunction.h
+++ b/llvm/include/llvm/CodeGen/MachineFunction.h
@@ -821,19 +821,6 @@ class MachineFunction {
       AtomicOrdering Ordering = AtomicOrdering::NotAtomic,
       AtomicOrdering FailureOrdering = AtomicOrdering::NotAtomic);
 
-  LLVM_ATTRIBUTE_DEPRECATED(
-      inline MachineMemOperand *getMachineMemOperand(
-          MachinePointerInfo PtrInfo, MachineMemOperand::Flags f, uint64_t s,
-          unsigned base_alignment, const AAMDNodes &AAInfo = AAMDNodes(),
-          const MDNode *Ranges = nullptr,
-          SyncScope::ID SSID = SyncScope::System,
-          AtomicOrdering Ordering = AtomicOrdering::NotAtomic,
-          AtomicOrdering FailureOrdering = AtomicOrdering::NotAtomic),
-      "Use the version that takes Align instead") {
-    return getMachineMemOperand(PtrInfo, f, s, Align(base_alignment), AAInfo,
-                                Ranges, SSID, Ordering, FailureOrdering);
-  }
-
   /// getMachineMemOperand - Allocate a new MachineMemOperand by copying
   /// an existing one, adjusting by an offset and using the given size.
   /// MachineMemOperands are owned by the MachineFunction and need not be

diff  --git a/llvm/lib/Target/VE/VEInstrInfo.cpp b/llvm/lib/Target/VE/VEInstrInfo.cpp
index ac60d62e0159..cec8fb5ad536 100644
--- a/llvm/lib/Target/VE/VEInstrInfo.cpp
+++ b/llvm/lib/Target/VE/VEInstrInfo.cpp
@@ -351,7 +351,7 @@ void VEInstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
   const MachineFrameInfo &MFI = MF->getFrameInfo();
   MachineMemOperand *MMO = MF->getMachineMemOperand(
       MachinePointerInfo::getFixedStack(*MF, FI), MachineMemOperand::MOStore,
-      MFI.getObjectSize(FI), MFI.getObjectAlignment(FI));
+      MFI.getObjectSize(FI), MFI.getObjectAlign(FI));
 
   // On the order of operands here: think "[FrameIdx + 0] = SrcReg".
   if (RC == &VE::I64RegClass) {
@@ -392,7 +392,7 @@ void VEInstrInfo::loadRegFromStackSlot(MachineBasicBlock &MBB,
   const MachineFrameInfo &MFI = MF->getFrameInfo();
   MachineMemOperand *MMO = MF->getMachineMemOperand(
       MachinePointerInfo::getFixedStack(*MF, FI), MachineMemOperand::MOLoad,
-      MFI.getObjectSize(FI), MFI.getObjectAlignment(FI));
+      MFI.getObjectSize(FI), MFI.getObjectAlign(FI));
 
   if (RC == &VE::I64RegClass) {
     BuildMI(MBB, I, DL, get(VE::LDrii), DestReg)