[libFuzzer] Use long long to ensure 64 bits.

Marcos Pividori · Marcos Pividori · commit 5a5356762054 · 2017-02-08T00:03:31.000Z
We should 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. Differential Revision: https://reviews.llvm.org/D29617 llvm-svn: 294390
diff --git a/llvm/lib/Fuzzer/FuzzerTracePC.cpp b/llvm/lib/Fuzzer/FuzzerTracePC.cpp
@@ -273,7 +273,7 @@ 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);
diff --git a/llvm/lib/Fuzzer/FuzzerValueBitMap.h b/llvm/lib/Fuzzer/FuzzerValueBitMap.h
@@ -68,7 +68,7 @@ struct ValueBitMap {
         Other.Map[i] = 0;
       }
       if (M)
-        Res += __builtin_popcountl(M);
+        Res += __builtin_popcountll(M);
     }
     NumBits = Res;
     return OldNumBits < NumBits;
diff --git a/llvm/lib/Fuzzer/test/AbsNegAndConstant64Test.cpp b/llvm/lib/Fuzzer/test/AbsNegAndConstant64Test.cpp
@@ -14,7 +14,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   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);
   }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ struct ValueBitMap {`
`68`	`68`	`Other.Map[i] = 0;`
`69`	`69`	`}`
`70`	`70`	`if (M)`
`71`		`- Res += __builtin_popcountl(M);`
	`71`	`+ Res += __builtin_popcountll(M);`
`72`	`72`	`}`
`73`	`73`	`NumBits = Res;`
`74`	`74`	`return OldNumBits < NumBits;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {`
`14`	`14`	`uint64_t y;`
`15`	`15`	`memcpy(&x, Data, sizeof(x));`
`16`	`16`	`memcpy(&y, Data + sizeof(x), sizeof(y));`
`17`		`- if (labs(x) < 0 && y == 0xbaddcafedeadbeefUL) {`
	`17`	`+ if (llabs(x) < 0 && y == 0xbaddcafedeadbeefULL) {`
`18`	`18`	`printf("BINGO; Found the target, exiting; x = 0x%lx y 0x%lx\n", x, y);`
`19`	`19`	`exit(1);`
`20`	`20`	`}`