@@ -529,7 +529,7 @@ void InstructionSelector::VisitWord32And(Node* node) {
529529 if (m.left ().IsWord32Shr () && CanCover (node, m.left ().node ()) &&
530530 m.right ().HasValue ()) {
531531 uint32_t mask = m.right ().Value ();
532- uint32_t mask_width = base::bits::CountPopulation32 (mask);
532+ uint32_t mask_width = base::bits::CountPopulation (mask);
533533 uint32_t mask_msb = base::bits::CountLeadingZeros32 (mask);
534534 if ((mask_width != 0 ) && (mask_msb + mask_width == 32 )) {
535535 // The mask must be contiguous, and occupy the least-significant bits.
@@ -558,7 +558,7 @@ void InstructionSelector::VisitWord32And(Node* node) {
558558 }
559559 if (m.right ().HasValue ()) {
560560 uint32_t mask = m.right ().Value ();
561- uint32_t shift = base::bits::CountPopulation32 (~mask);
561+ uint32_t shift = base::bits::CountPopulation (~mask);
562562 uint32_t msb = base::bits::CountLeadingZeros32 (~mask);
563563 if (shift != 0 && shift != 32 && msb + shift == 32 ) {
564564 // Insert zeros for (x >> K) << K => x & ~(2^K - 1) expression reduction
@@ -579,7 +579,7 @@ void InstructionSelector::VisitWord64And(Node* node) {
579579 if (m.left ().IsWord64Shr () && CanCover (node, m.left ().node ()) &&
580580 m.right ().HasValue ()) {
581581 uint64_t mask = m.right ().Value ();
582- uint32_t mask_width = base::bits::CountPopulation64 (mask);
582+ uint32_t mask_width = base::bits::CountPopulation (mask);
583583 uint32_t mask_msb = base::bits::CountLeadingZeros64 (mask);
584584 if ((mask_width != 0 ) && (mask_msb + mask_width == 64 )) {
585585 // The mask must be contiguous, and occupy the least-significant bits.
@@ -612,7 +612,7 @@ void InstructionSelector::VisitWord64And(Node* node) {
612612 }
613613 if (m.right ().HasValue ()) {
614614 uint64_t mask = m.right ().Value ();
615- uint32_t shift = base::bits::CountPopulation64 (~mask);
615+ uint32_t shift = base::bits::CountPopulation (~mask);
616616 uint32_t msb = base::bits::CountLeadingZeros64 (~mask);
617617 if (shift != 0 && shift < 32 && msb + shift == 64 ) {
618618 // Insert zeros for (x >> K) << K => x & ~(2^K - 1) expression reduction
@@ -696,7 +696,7 @@ void InstructionSelector::VisitWord32Shl(Node* node) {
696696 // contiguous, and the shift immediate non-zero.
697697 if (mleft.right ().HasValue ()) {
698698 uint32_t mask = mleft.right ().Value ();
699- uint32_t mask_width = base::bits::CountPopulation32 (mask);
699+ uint32_t mask_width = base::bits::CountPopulation (mask);
700700 uint32_t mask_msb = base::bits::CountLeadingZeros32 (mask);
701701 if ((mask_width != 0 ) && (mask_msb + mask_width == 32 )) {
702702 uint32_t shift = m.right ().Value ();
@@ -726,7 +726,7 @@ void InstructionSelector::VisitWord32Shr(Node* node) {
726726 // Select Ext for Shr(And(x, mask), imm) where the result of the mask is
727727 // shifted into the least-significant bits.
728728 uint32_t mask = (mleft.right ().Value () >> lsb) << lsb;
729- unsigned mask_width = base::bits::CountPopulation32 (mask);
729+ unsigned mask_width = base::bits::CountPopulation (mask);
730730 unsigned mask_msb = base::bits::CountLeadingZeros32 (mask);
731731 if ((mask_msb + mask_width + lsb) == 32 ) {
732732 Mips64OperandGenerator g (this );
@@ -788,7 +788,7 @@ void InstructionSelector::VisitWord64Shl(Node* node) {
788788 Int64BinopMatcher mleft (m.left ().node ());
789789 if (mleft.right ().HasValue ()) {
790790 uint64_t mask = mleft.right ().Value ();
791- uint32_t mask_width = base::bits::CountPopulation64 (mask);
791+ uint32_t mask_width = base::bits::CountPopulation (mask);
792792 uint32_t mask_msb = base::bits::CountLeadingZeros64 (mask);
793793 if ((mask_width != 0 ) && (mask_msb + mask_width == 64 )) {
794794 uint64_t shift = m.right ().Value ();
@@ -819,7 +819,7 @@ void InstructionSelector::VisitWord64Shr(Node* node) {
819819 // Select Dext for Shr(And(x, mask), imm) where the result of the mask is
820820 // shifted into the least-significant bits.
821821 uint64_t mask = (mleft.right ().Value () >> lsb) << lsb;
822- unsigned mask_width = base::bits::CountPopulation64 (mask);
822+ unsigned mask_width = base::bits::CountPopulation (mask);
823823 unsigned mask_msb = base::bits::CountLeadingZeros64 (mask);
824824 if ((mask_msb + mask_width + lsb) == 64 ) {
825825 Mips64OperandGenerator g (this );
0 commit comments