]> granicus.if.org Git - llvm/commitdiff
CombinerHelper - silence dead assignment warnings. NFCI.
authorSimon Pilgrim <llvm-dev@redking.me.uk>
Wed, 16 Oct 2019 17:21:50 +0000 (17:21 +0000)
committerSimon Pilgrim <llvm-dev@redking.me.uk>
Wed, 16 Oct 2019 17:21:50 +0000 (17:21 +0000)
Copy the NewAlignment value to Alignment first and then use that to update the stack frame object alignments.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@375019 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/GlobalISel/CombinerHelper.cpp

index 974b500d4abb5bfd73a52c0a2ce1da65fe6bb156..e9de6c2c98d9bdb7879c024d23cac524ca0fbecd 100644 (file)
@@ -779,11 +779,11 @@ bool CombinerHelper::optimizeMemset(MachineInstr &MI, Register Dst, Register Val
     Type *IRTy = getTypeForLLT(MemOps[0], C);
     unsigned NewAlign = (unsigned)DL.getABITypeAlignment(IRTy);
     if (NewAlign > Align) {
+      Align = NewAlign;
       unsigned FI = FIDef->getOperand(1).getIndex();
       // Give the stack frame object a larger alignment if needed.
-      if (MFI.getObjectAlignment(FI) < NewAlign)
-        MFI.setObjectAlignment(FI, NewAlign);
-      Align = NewAlign;
+      if (MFI.getObjectAlignment(FI) < Align)
+        MFI.setObjectAlignment(FI, Align);
     }
   }
 
@@ -907,11 +907,11 @@ bool CombinerHelper::optimizeMemcpy(MachineInstr &MI, Register Dst,
         NewAlign /= 2;
 
     if (NewAlign > Alignment) {
+      Alignment = NewAlign;
       unsigned FI = FIDef->getOperand(1).getIndex();
       // Give the stack frame object a larger alignment if needed.
-      if (MFI.getObjectAlignment(FI) < NewAlign)
-        MFI.setObjectAlignment(FI, NewAlign);
-      Alignment = NewAlign;
+      if (MFI.getObjectAlignment(FI) < Alignment)
+        MFI.setObjectAlignment(FI, Alignment);
     }
   }
 
@@ -1014,11 +1014,11 @@ bool CombinerHelper::optimizeMemmove(MachineInstr &MI, Register Dst,
         NewAlign /= 2;
 
     if (NewAlign > Alignment) {
+      Alignment = NewAlign;
       unsigned FI = FIDef->getOperand(1).getIndex();
       // Give the stack frame object a larger alignment if needed.
-      if (MFI.getObjectAlignment(FI) < NewAlign)
-        MFI.setObjectAlignment(FI, NewAlign);
-      Alignment = NewAlign;
+      if (MFI.getObjectAlignment(FI) < Alignment)
+        MFI.setObjectAlignment(FI, Alignment);
     }
   }