[libFuzzer] Use long long to ensure 64 bits.

[mpividori]

Summary

We need to always use unsigned long long to ensure 64 bits. On Windows, unsigned long is 4 bytes.
This was the reason why value-profile-cmp4.test was failing on Windows.

[mpividori]

@kcc do you agree with these changes?

[kcc]

LGTM

llvm/trunk/lib/Fuzzer/FuzzerTracePC.cpp

void TracePC::AddValueForMemcmp(void *caller_pc, const void *s1, const void *s2,
   TORCW.Insert(Idx ^ Hash, Word(B1, Len), Word(B2, Len));
 }
 
 template <class T>
 ATTRIBUTE_TARGET_POPCNT ALWAYS_INLINE
 ATTRIBUTE_NO_SANITIZE_ALL
 void TracePC::HandleCmp(uintptr_t PC, T Arg1, T Arg2) {
   uint64_t ArgXor = Arg1 ^ Arg2;
-  uint64_t ArgDistance = __builtin_popcountl(ArgXor) + 1; // [1,65]
+  uint64_t ArgDistance = __builtin_popcountll(ArgXor) + 1; // [1,65]
   uintptr_t Idx = ((PC & 4095) + 1) * ArgDistance;
   if (sizeof(T) == 4)
       TORC4.Insert(ArgXor, Arg1, Arg2);
   else if (sizeof(T) == 8)
       TORC8.Insert(ArgXor, Arg1, Arg2);
   ValueProfileMap.AddValue(Idx);
 }
 

llvm/trunk/lib/Fuzzer/FuzzerValueBitMap.h

bool MergeFrom(ValueBitMap &Other) {
     for (size_t i = 0; i < kMapSizeInWords; i++) {
       auto O = Other.Map[i];
       auto M = Map[i];
       if (O) {
         Map[i] = (M |= O);
         Other.Map[i] = 0;
       }
       if (M)
-        Res += __builtin_popcountl(M);
+        Res += __builtin_popcountll(M);
     }
     NumBits = Res;
     return OldNumBits < NumBits;
   }
 
   template <class Callback>
   ATTRIBUTE_NO_SANITIZE_ALL
   void ForEach(Callback CB) {

llvm/trunk/lib/Fuzzer/test/AbsNegAndConstant64Test.cpp

 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
 // abs(x) < 0 and y == Const puzzle, 64-bit variant.
 #include <cstring>
 #include <cstdint>
 #include <cstdlib>
 #include <cstddef>
 #include <cstdio>
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   if (Size < 16) return 0;
   int64_t x;
   uint64_t y;
   memcpy(&x, Data, sizeof(x));
   memcpy(&y, Data + sizeof(x), sizeof(y));
-  if (labs(x) < 0 && y == 0xbaddcafedeadbeefUL) {
+  if (llabs(x) < 0 && y == 0xbaddcafedeadbeefULL) {
     printf("BINGO; Found the target, exiting; x = 0x%lx y 0x%lx\n", x, y);
     exit(1);
   }
   return 0;
 }