summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff options
context:
space:
mode:
authorMehdi Amini <mehdi.amini@apple.com>2015-07-09 15:12:23 +0000
committerMehdi Amini <mehdi.amini@apple.com>2015-07-09 15:12:23 +0000
commiteaabc51e786b049b1c5172332e38958af0d7c72a (patch)
tree8ed08efeca3fe3c801fec13a3f4e29f598b0afa6 /llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
parentd1b818bcf414dea158df3a3ab33e0d62da0aa0d8 (diff)
downloadbcm5719-llvm-eaabc51e786b049b1c5172332e38958af0d7c72a.tar.gz
bcm5719-llvm-eaabc51e786b049b1c5172332e38958af0d7c72a.zip
Re-instate the EVT parameter to getScalarShiftAmountTy() for OOT user
A documentation for this function would be nice by the way. From: Mehdi Amini <mehdi.amini@apple.com> llvm-svn: 241807
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp')
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index 673c46102db..86b73d35806 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -444,7 +444,8 @@ namespace {
if (LHSTy.isVector())
return LHSTy;
auto &DL = DAG.getDataLayout();
- return LegalTypes ? TLI.getScalarShiftAmountTy(DL) : TLI.getPointerTy(DL);
+ return LegalTypes ? TLI.getScalarShiftAmountTy(DL, LHSTy)
+ : TLI.getPointerTy(DL);
}
/// This method returns true if we are running before type legalization or
OpenPOWER on IntegriCloud