summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen
diff options
context:
space:
mode:
authorVolkan Keles <vkeles@apple.com>2018-10-25 17:52:19 +0000
committerVolkan Keles <vkeles@apple.com>2018-10-25 17:52:19 +0000
commit60c6affcb0a934218068a79be40147e1a16c8f28 (patch)
tree28dd8fee420701f842d93aa83479c91d7e4c8662 /llvm/lib/CodeGen
parent0c16a13fb9148b3190f792dc726ffb9261163da8 (diff)
downloadbcm5719-llvm-60c6affcb0a934218068a79be40147e1a16c8f28.tar.gz
bcm5719-llvm-60c6affcb0a934218068a79be40147e1a16c8f28.zip
[GlobalISel] LegalizerHelper: Fix the incorrect alignment when splitting loads/stores in narrowScalar
Reviewers: dsanders, bogner, jpaquette, aemerson, ab, paquette Reviewed By: dsanders Subscribers: rovka, kristof.beyls, javed.absar, llvm-commits Differential Revision: https://reviews.llvm.org/D53664 llvm-svn: 345292
Diffstat (limited to 'llvm/lib/CodeGen')
-rw-r--r--llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp b/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
index c9ed97aa390..516f5ce4343 100644
--- a/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
@@ -467,12 +467,12 @@ LegalizerHelper::LegalizeResult LegalizerHelper::narrowScalar(MachineInstr &MI,
unsigned DstReg = MRI.createGenericVirtualRegister(NarrowTy);
unsigned SrcReg = 0;
unsigned Adjustment = i * NarrowSize / 8;
+ unsigned Alignment = MinAlign(MMO.getAlignment(), Adjustment);
MachineMemOperand *SplitMMO = MIRBuilder.getMF().getMachineMemOperand(
MMO.getPointerInfo().getWithOffset(Adjustment), MMO.getFlags(),
- NarrowSize / 8, i == 0 ? MMO.getAlignment() : NarrowSize / 8,
- MMO.getAAInfo(), MMO.getRanges(), MMO.getSyncScopeID(),
- MMO.getOrdering(), MMO.getFailureOrdering());
+ NarrowSize / 8, Alignment, MMO.getAAInfo(), MMO.getRanges(),
+ MMO.getSyncScopeID(), MMO.getOrdering(), MMO.getFailureOrdering());
MIRBuilder.materializeGEP(SrcReg, MI.getOperand(1).getReg(), OffsetTy,
Adjustment);
@@ -509,12 +509,12 @@ LegalizerHelper::LegalizeResult LegalizerHelper::narrowScalar(MachineInstr &MI,
for (int i = 0; i < NumParts; ++i) {
unsigned DstReg = 0;
unsigned Adjustment = i * NarrowSize / 8;
+ unsigned Alignment = MinAlign(MMO.getAlignment(), Adjustment);
MachineMemOperand *SplitMMO = MIRBuilder.getMF().getMachineMemOperand(
MMO.getPointerInfo().getWithOffset(Adjustment), MMO.getFlags(),
- NarrowSize / 8, i == 0 ? MMO.getAlignment() : NarrowSize / 8,
- MMO.getAAInfo(), MMO.getRanges(), MMO.getSyncScopeID(),
- MMO.getOrdering(), MMO.getFailureOrdering());
+ NarrowSize / 8, Alignment, MMO.getAAInfo(), MMO.getRanges(),
+ MMO.getSyncScopeID(), MMO.getOrdering(), MMO.getFailureOrdering());
MIRBuilder.materializeGEP(DstReg, MI.getOperand(1).getReg(), OffsetTy,
Adjustment);
OpenPOWER on IntegriCloud