From 90d990e034f05f4d9e0354f54205fd3b471f6507 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 12 Oct 2016 07:26:46 +0000 Subject: [PATCH] Revert "[libFuzzer] refactoring to speed things up, NFC" This reverts commit r283946. This breaks when build with GCC: lib/Fuzzer/FuzzerTracePC.cpp:169:6: error: always_inline function might not be inlinable [-Werror=attributes] lib/Fuzzer/FuzzerTracePC.cpp:169:6: error: inlining failed in call to always_inline 'void fuzzer::TracePC::HandleCmp(void*, T, T) [with T = long unsigned int]': target specific option mismatch lib/Fuzzer/FuzzerTracePC.cpp:198:65: error: called from here llvm-svn: 283979 --- llvm/lib/Fuzzer/FuzzerTracePC.cpp | 51 +++++++++++++++++++++++++-------------- llvm/lib/Fuzzer/FuzzerTracePC.h | 4 +-- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/llvm/lib/Fuzzer/FuzzerTracePC.cpp b/llvm/lib/Fuzzer/FuzzerTracePC.cpp index d6e5348..3b3e1f2 100644 --- a/llvm/lib/Fuzzer/FuzzerTracePC.cpp +++ b/llvm/lib/Fuzzer/FuzzerTracePC.cpp @@ -64,7 +64,7 @@ void TracePC::PrintModuleInfo() { void TracePC::ResetGuards() { uint32_t N = 0; for (size_t M = 0; M < NumModules; M++) - for (uint32_t *X = Modules[M].Start, *End = Modules[M].Stop; X < End; X++) + for (uint32_t *X = Modules[M].Start; X < Modules[M].Stop; X++) *X = ++N; assert(N == NumGuards); } @@ -163,16 +163,24 @@ void TracePC::AddValueForStrcmp(void *caller_pc, const char *s1, const char *s2, TPC.HandleValueProfile((PC & 4095) | (Idx << 12)); } -template ATTRIBUTE_TARGET_POPCNT -__attribute__((always_inline)) -void TracePC::HandleCmp(void *PC, T Arg1, T Arg2) { - uintptr_t PCuint = reinterpret_cast(PC); +static void AddValueForCmp(void *PCptr, uint64_t Arg1, uint64_t Arg2) { + uintptr_t PC = reinterpret_cast(PCptr); uint64_t ArgDistance = __builtin_popcountl(Arg1 ^ Arg2) + 1; // [1,65] - uintptr_t Idx = ((PCuint & 4095) + 1) * ArgDistance; + uintptr_t Idx = ((PC & 4095) + 1) * ArgDistance; TPC.HandleValueProfile(Idx); } +static void AddValueForSingleVal(void *PCptr, uintptr_t Val) { + if (!Val) return; + uintptr_t PC = reinterpret_cast(PCptr); + uint64_t ArgDistance = __builtin_popcountl(Val) - 1; // [0,63] + uintptr_t Idx = (PC & 4095) | (ArgDistance << 12); + TPC.HandleValueProfile(Idx); +} + + + } // namespace fuzzer extern "C" { @@ -193,21 +201,28 @@ void __sanitizer_cov_trace_pc_indir(uintptr_t Callee) { fuzzer::TPC.HandleCallerCallee(PC, Callee); } +// TODO: this one will not be used with the newest clang. Remove it. +__attribute__((visibility("default"))) +void __sanitizer_cov_trace_cmp(uint64_t SizeAndType, uint64_t Arg1, + uint64_t Arg2) { + fuzzer::AddValueForCmp(__builtin_return_address(0), Arg1, Arg2); +} + __attribute__((visibility("default"))) -void __sanitizer_cov_trace_cmp8(uint64_t Arg1, uint64_t Arg2) { - fuzzer::TPC.HandleCmp(__builtin_return_address(0), Arg1, Arg2); +void __sanitizer_cov_trace_cmp8(uint64_t Arg1, int64_t Arg2) { + fuzzer::AddValueForCmp(__builtin_return_address(0), Arg1, Arg2); } __attribute__((visibility("default"))) -void __sanitizer_cov_trace_cmp4(uint32_t Arg1, uint32_t Arg2) { - fuzzer::TPC.HandleCmp(__builtin_return_address(0), Arg1, Arg2); +void __sanitizer_cov_trace_cmp4(uint32_t Arg1, int32_t Arg2) { + fuzzer::AddValueForCmp(__builtin_return_address(0), Arg1, Arg2); } __attribute__((visibility("default"))) -void __sanitizer_cov_trace_cmp2(uint16_t Arg1, uint16_t Arg2) { - fuzzer::TPC.HandleCmp(__builtin_return_address(0), Arg1, Arg2); +void __sanitizer_cov_trace_cmp2(uint16_t Arg1, int16_t Arg2) { + fuzzer::AddValueForCmp(__builtin_return_address(0), Arg1, Arg2); } __attribute__((visibility("default"))) -void __sanitizer_cov_trace_cmp1(uint8_t Arg1, uint8_t Arg2) { - fuzzer::TPC.HandleCmp(__builtin_return_address(0), Arg1, Arg2); +void __sanitizer_cov_trace_cmp1(uint8_t Arg1, int8_t Arg2) { + fuzzer::AddValueForCmp(__builtin_return_address(0), Arg1, Arg2); } __attribute__((visibility("default"))) @@ -217,20 +232,20 @@ void __sanitizer_cov_trace_switch(uint64_t Val, uint64_t *Cases) { char *PC = (char*)__builtin_return_address(0); for (size_t i = 0; i < N; i++) if (Val != Vals[i]) - fuzzer::TPC.HandleCmp(PC + i, Val, Vals[i]); + fuzzer::AddValueForCmp(PC + i, Val, Vals[i]); } __attribute__((visibility("default"))) void __sanitizer_cov_trace_div4(uint32_t Val) { - fuzzer::TPC.HandleCmp(__builtin_return_address(0), Val, (uint32_t)0); + fuzzer::AddValueForSingleVal(__builtin_return_address(0), Val); } __attribute__((visibility("default"))) void __sanitizer_cov_trace_div8(uint64_t Val) { - fuzzer::TPC.HandleCmp(__builtin_return_address(0), Val, (uint64_t)0); + fuzzer::AddValueForSingleVal(__builtin_return_address(0), Val); } __attribute__((visibility("default"))) void __sanitizer_cov_trace_gep(uintptr_t Idx) { - fuzzer::TPC.HandleCmp(__builtin_return_address(0), Idx, (uintptr_t)0); + fuzzer::AddValueForSingleVal(__builtin_return_address(0), Idx); } } // extern "C" diff --git a/llvm/lib/Fuzzer/FuzzerTracePC.h b/llvm/lib/Fuzzer/FuzzerTracePC.h index 788e6f4..9a10b44 100644 --- a/llvm/lib/Fuzzer/FuzzerTracePC.h +++ b/llvm/lib/Fuzzer/FuzzerTracePC.h @@ -25,7 +25,6 @@ class TracePC { void HandleInit(uint32_t *start, uint32_t *stop); void HandleCallerCallee(uintptr_t Caller, uintptr_t Callee); void HandleValueProfile(size_t Value) { ValueProfileMap.AddValue(Value); } - template void HandleCmp(void *PC, T Arg1, T Arg2); size_t GetTotalPCCoverage() { return TotalPCCoverage; } void ResetTotalPCCoverage() { TotalPCCoverage = 0; } void SetUseCounters(bool UC) { UseCounters = UC; } @@ -33,7 +32,8 @@ class TracePC { size_t FinalizeTrace(InputCorpus *C, size_t InputSize, bool Shrink); bool UpdateValueProfileMap(ValueBitMap *MaxValueProfileMap) { return UseValueProfile && MaxValueProfileMap->MergeFrom(ValueProfileMap); - } + } + size_t GetNewPCIDs(uintptr_t **NewPCIDsPtr) { *NewPCIDsPtr = NewPCIDs; -- 2.7.4