summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorNirav Dave <niravd@google.com>2017-11-29 18:06:13 +0000
committerNirav Dave <niravd@google.com>2017-11-29 18:06:13 +0000
commitbafaa53c4daf3c17e89bcbf3ebb9190f52e755c9 (patch)
treec18500ad23b4f9d728150a1be4c4b2f7eae710f7 /llvm/lib
parent5764997ff2ca82be889fab3271c43637f705a272 (diff)
downloadbcm5719-llvm-bafaa53c4daf3c17e89bcbf3ebb9190f52e755c9.tar.gz
bcm5719-llvm-bafaa53c4daf3c17e89bcbf3ebb9190f52e755c9.zip
[ARM][DAG] Revert Disable post-legalization store merge for ARM
Partially reverting enabling of post-legalization store merge (r319036) for just ARM backend as it is causing incorrect code in some Thumb2 cases. llvm-svn: 319331
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Target/ARM/ARMISelLowering.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.h b/llvm/lib/Target/ARM/ARMISelLowering.h
index a791e2ea233..01f101d5bd5 100644
--- a/llvm/lib/Target/ARM/ARMISelLowering.h
+++ b/llvm/lib/Target/ARM/ARMISelLowering.h
@@ -532,6 +532,9 @@ class VectorType;
bool canCombineStoreAndExtract(Type *VectorTy, Value *Idx,
unsigned &Cost) const override;
+ // Disable currently because of invalid merge.
+ bool mergeStoresAfterLegalization() const override { return false; }
+
bool canMergeStoresTo(unsigned AddressSpace, EVT MemVT,
const SelectionDAG &DAG) const override {
// Do not merge to larger than i32.
OpenPOWER on IntegriCloud