[Lldb-commits] [lldb] r223687 - Remove use of GCC-style intrinsics, as they are non-portable.

[Zachary Turner]

Author: zturner
Date: Mon Dec  8 14:00:33 2014
New Revision: 223687

URL: http://llvm.org/viewvc/llvm-project?rev=223687&view=rev
Log:
Remove use of GCC-style intrinsics, as they are non-portable.

Differential Revision: http://reviews.llvm.org/D6567

Modified:
    lldb/trunk/source/Symbol/CompactUnwindInfo.cpp

Modified: lldb/trunk/source/Symbol/CompactUnwindInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/CompactUnwindInfo.cpp?rev=223687&r1=223686&r2=223687&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/CompactUnwindInfo.cpp (original)
+++ lldb/trunk/source/Symbol/CompactUnwindInfo.cpp Mon Dec  8 14:00:33 2014
@@ -21,6 +21,8 @@
 #include "lldb/Symbol/ObjectFile.h"
 #include "lldb/Symbol/UnwindPlan.h"
 
+#include "llvm/Support/MathExtras.h"
+
 using namespace lldb;
 using namespace lldb_private;
 
@@ -109,7 +111,8 @@ namespace lldb_private {
 #endif
 
 #define EXTRACT_BITS(value, mask) \
-        ( (value >> __builtin_ctz(mask)) & (((1 << __builtin_popcount(mask)))-1) )
+        ( (value >> llvm::countTrailingZeros(static_cast<uint32_t>(mask), llvm::ZB_Width)) & \
+          (((1 << llvm::CountPopulation_32(static_cast<uint32_t>(mask))))-1) )