From 284582b6d4798b2e12b662b0a09521f0da97aa19 Mon Sep 17 00:00:00 2001 From: Sanjay Patel Date: Wed, 14 Sep 2016 16:54:10 +0000 Subject: getValueType().getScalarSizeInBits() -> getScalarValueSizeInBits(), round 2 ; NFCI llvm-svn: 281498 --- llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 4 ++-- llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'llvm/lib/CodeGen') diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp index 9000cdd208b..bdcf4d07c02 100644 --- a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp @@ -1216,7 +1216,7 @@ SDValue SelectionDAGLegalize::ExpandExtractFromVectorThroughStack(SDValue Op) { } // Add the offset to the index. - unsigned EltSize = Vec.getValueType().getScalarSizeInBits() / 8; + unsigned EltSize = Vec.getScalarValueSizeInBits() / 8; Idx = DAG.getNode(ISD::MUL, dl, Idx.getValueType(), Idx, DAG.getConstant(EltSize, SDLoc(Vec), Idx.getValueType())); @@ -1267,7 +1267,7 @@ SDValue SelectionDAGLegalize::ExpandInsertToVectorThroughStack(SDValue Op) { // Then store the inserted part. // Add the offset to the index. - unsigned EltSize = Vec.getValueType().getScalarSizeInBits() / 8; + unsigned EltSize = Vec.getScalarValueSizeInBits() / 8; Idx = DAG.getNode(ISD::MUL, dl, Idx.getValueType(), Idx, DAG.getConstant(EltSize, SDLoc(Vec), Idx.getValueType())); diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp index d3489a97604..4e34a579ad5 100644 --- a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp @@ -794,8 +794,7 @@ void DAGTypeLegalizer::SetScalarizedVector(SDValue Op, SDValue Result) { // Note that in some cases vector operation operands may be greater than // the vector element type. For example BUILD_VECTOR of type <1 x i1> with // a constant i8 operand. - assert(Result.getValueSizeInBits() >= - Op.getValueType().getScalarSizeInBits() && + assert(Result.getValueSizeInBits() >= Op.getScalarValueSizeInBits() && "Invalid type for scalarized vector"); AnalyzeNewValue(Result); @@ -913,7 +912,7 @@ SDValue DAGTypeLegalizer::BitConvertToInteger(SDValue Op) { /// Convert to a vector of integers of the same size. SDValue DAGTypeLegalizer::BitConvertVectorToIntegerVector(SDValue Op) { assert(Op.getValueType().isVector() && "Only applies to vectors!"); - unsigned EltWidth = Op.getValueType().getScalarSizeInBits(); + unsigned EltWidth = Op.getScalarValueSizeInBits(); EVT EltNVT = EVT::getIntegerVT(*DAG.getContext(), EltWidth); unsigned NumElts = Op.getValueType().getVectorNumElements(); return DAG.getNode(ISD::BITCAST, SDLoc(Op), -- cgit v1.2.3