diff options
| author | Mehdi Amini <mehdi.amini@apple.com> | 2015-07-09 15:12:23 +0000 |
|---|---|---|
| committer | Mehdi Amini <mehdi.amini@apple.com> | 2015-07-09 15:12:23 +0000 |
| commit | eaabc51e786b049b1c5172332e38958af0d7c72a (patch) | |
| tree | 8ed08efeca3fe3c801fec13a3f4e29f598b0afa6 /llvm/lib/Target/X86 | |
| parent | d1b818bcf414dea158df3a3ab33e0d62da0aa0d8 (diff) | |
| download | bcm5719-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/Target/X86')
| -rw-r--r-- | llvm/lib/Target/X86/X86ISelLowering.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86ISelLowering.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index 559056d6b2f..7360d90ef3f 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -4852,7 +4852,7 @@ static SDValue getVShift(bool isLeft, EVT VT, SDValue SrcOp, MVT ShVT = MVT::v2i64; unsigned Opc = isLeft ? X86ISD::VSHLDQ : X86ISD::VSRLDQ; SrcOp = DAG.getBitcast(ShVT, SrcOp); - MVT ScalarShiftTy = TLI.getScalarShiftAmountTy(DAG.getDataLayout()); + MVT ScalarShiftTy = TLI.getScalarShiftAmountTy(DAG.getDataLayout(), VT); assert(NumBits % 8 == 0 && "Only support byte sized shifts"); SDValue ShiftVal = DAG.getConstant(NumBits/8, dl, ScalarShiftTy); return DAG.getBitcast(VT, DAG.getNode(Opc, dl, ShVT, SrcOp, ShiftVal)); @@ -7409,7 +7409,7 @@ static SDValue lowerVectorShuffleAsElementInsertion( X86ISD::VSHLDQ, DL, MVT::v2i64, V2, DAG.getConstant(V2Index * EltVT.getSizeInBits() / 8, DL, DAG.getTargetLoweringInfo().getScalarShiftAmountTy( - DAG.getDataLayout()))); + DAG.getDataLayout(), VT))); V2 = DAG.getBitcast(VT, V2); } } diff --git a/llvm/lib/Target/X86/X86ISelLowering.h b/llvm/lib/Target/X86/X86ISelLowering.h index a2cef18af9c..8bb8aa6cfdb 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.h +++ b/llvm/lib/Target/X86/X86ISelLowering.h @@ -598,7 +598,7 @@ namespace llvm { unsigned getJumpTableEncoding() const override; bool useSoftFloat() const override; - MVT getScalarShiftAmountTy(const DataLayout &) const override { + MVT getScalarShiftAmountTy(const DataLayout &, EVT) const override { return MVT::i8; } |
