| Index: src/heap/mark-compact.cc
 | 
| diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc
 | 
| index 8a44ce1677268ef549c564cfbdffeed0a86c3da4..f114ba3f229e471809db91f7e90aaa2d780e9c00 100644
 | 
| --- a/src/heap/mark-compact.cc
 | 
| +++ b/src/heap/mark-compact.cc
 | 
| @@ -5,6 +5,7 @@
 | 
|  #include "src/v8.h"
 | 
|  
 | 
|  #include "src/base/atomicops.h"
 | 
| +#include "src/base/bits.h"
 | 
|  #include "src/code-stubs.h"
 | 
|  #include "src/compilation-cache.h"
 | 
|  #include "src/cpu-profiler.h"
 | 
| @@ -1926,7 +1927,7 @@ static void DiscoverGreyObjectsOnPage(MarkingDeque* marking_deque,
 | 
|  
 | 
|      int offset = 0;
 | 
|      while (grey_objects != 0) {
 | 
| -      int trailing_zeros = CompilerIntrinsics::CountTrailingZeros(grey_objects);
 | 
| +      int trailing_zeros = base::bits::CountTrailingZeros32(grey_objects);
 | 
|        grey_objects >>= trailing_zeros;
 | 
|        offset += trailing_zeros;
 | 
|        MarkBit markbit(cell, 1 << offset, false);
 | 
| @@ -1965,7 +1966,7 @@ int MarkCompactCollector::DiscoverAndEvacuateBlackObjectsOnPage(
 | 
|  
 | 
|      int offset = 0;
 | 
|      while (current_cell != 0) {
 | 
| -      int trailing_zeros = CompilerIntrinsics::CountTrailingZeros(current_cell);
 | 
| +      int trailing_zeros = base::bits::CountTrailingZeros32(current_cell);
 | 
|        current_cell >>= trailing_zeros;
 | 
|        offset += trailing_zeros;
 | 
|        Address address = cell_base + offset * kPointerSize;
 | 
| 
 |