[llvm] Use llvm::bit_width (NFC)

2 files changed, 5 insertions, 5 deletions

diff --git a/llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp b/llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp
index 3cb806a..949b88a 100644
--- a/llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp
+++ b/llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp
@@ -63,7 +63,7 @@ namespace {
       if (!isMask_32(value)) {
         return false;
       }
-      int msksize = 32 - countLeadingZeros(value);
+      int msksize = llvm::bit_width(value);
       return (msksize >= 1 && msksize <= 8) ||
               msksize == 16 || msksize == 24 || msksize == 32;
     }
@@ -145,9 +145,9 @@ void XCoreDAGToDAGISel::Select(SDNode *N) {
     if (immMskBitp(N)) {
       // Transformation function: get the size of a mask
       // Look for the first non-zero bit
-      SDValue MskSize = getI32Imm(32 - countLeadingZeros((uint32_t)Val), dl);
-      ReplaceNode(N, CurDAG->getMachineNode(XCore::MKMSK_rus, dl,
-                                            MVT::i32, MskSize));
+      SDValue MskSize = getI32Imm(llvm::bit_width((uint32_t)Val), dl);
+      ReplaceNode(
+          N, CurDAG->getMachineNode(XCore::MKMSK_rus, dl, MVT::i32, MskSize));
       return;
     }
     else if (!isUInt<16>(Val)) {
diff --git a/llvm/lib/Target/XCore/XCoreInstrInfo.td b/llvm/lib/Target/XCore/XCoreInstrInfo.td
index f2b42d4..de1fb60 100644
--- a/llvm/lib/Target/XCore/XCoreInstrInfo.td
+++ b/llvm/lib/Target/XCore/XCoreInstrInfo.td
@@ -96,7 +96,7 @@ def msksize_xform : SDNodeXForm<imm, [{
   // Transformation function: get the size of a mask
   assert(isMask_32(N->getZExtValue()));
   // look for the first non-zero bit
-  return getI32Imm(32 - countLeadingZeros((uint32_t)N->getZExtValue()),
+  return getI32Imm(llvm::bit_width((uint32_t)N->getZExtValue()),
                    SDLoc(N));
 }]>;