[libFuzzer] force proper popcnt instruction

llvm-svn: 279002

2 files changed, 3 insertions, 1 deletions

diff --git a/llvm/lib/Fuzzer/FuzzerTraceState.cpp b/llvm/lib/Fuzzer/FuzzerTraceState.cpp
index 9eae068c354..963480e2282 100644
--- a/llvm/lib/Fuzzer/FuzzerTraceState.cpp
+++ b/llvm/lib/Fuzzer/FuzzerTraceState.cpp
@@ -574,6 +574,7 @@ static void AddValueForStrcmp(void *caller_pc, const char *s1, const char *s2,
   VP.AddValue((PC & 4095) | (LastSameByte << 12));
 }
 
+__attribute__((target("popcnt")))
 static void AddValueForCmp(uintptr_t PC, uint64_t Arg1, uint64_t Arg2) {
   VP.AddValue((PC & 4095) | (__builtin_popcountl(Arg1 ^ Arg2) << 12));
 }
diff --git a/llvm/lib/Fuzzer/FuzzerValueBitMap.h b/llvm/lib/Fuzzer/FuzzerValueBitMap.h
index 65659f21349..e890e1e903e 100644
--- a/llvm/lib/Fuzzer/FuzzerValueBitMap.h
+++ b/llvm/lib/Fuzzer/FuzzerValueBitMap.h
@@ -25,7 +25,7 @@ struct ValueBitMap {
   void Reset() { memset(Map, 0, sizeof(Map)); }
 
   // Computed a hash function of Value and sets the corresponding bit.
-  void AddValue(uintptr_t Value) {
+  inline void AddValue(uintptr_t Value) {
     uintptr_t Idx = Value < kMapSizeInBits ? Value : Value % kMapSizeInBits;
     uintptr_t WordIdx = Idx / kBitsInWord;
     uintptr_t BitIdx = Idx % kBitsInWord;
@@ -34,6 +34,7 @@ struct ValueBitMap {
 
   // Merges 'Other' into 'this', clears 'Other',
   // returns the number of set bits in 'this'.
+  __attribute__((target("popcnt")))
   size_t MergeFrom(ValueBitMap &Other) {
     uintptr_t Res = 0;
     for (size_t i = 0; i < kMapSizeInWords; i++) {