diff options
| author | van Hauser <vh@thc.org> | 2023-06-26 10:03:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-26 10:03:03 +0300 |
| commit | aaa1d113e7302d8b6d9959843c723bd18767eb4d (patch) | |
| tree | a85edb127cf40b79623a2dd9792dcb28e1e763a9 | |
| parent | edd352612da1f58832cbe84d909a8998ce4fa690 (diff) | |
| parent | cac713ec304b40e815d54e0991adcb14290f8f30 (diff) | |
| download | afl++-aaa1d113e7302d8b6d9959843c723bd18767eb4d.tar.gz | |
Merge pull request #1784 from AFLplusplus/toka_0624
delete duplicate branches
| -rw-r--r-- | instrumentation/SanitizerCoverageLTO.so.cc | 2 | ||||
| -rw-r--r-- | instrumentation/SanitizerCoveragePCGUARD.so.cc | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/instrumentation/SanitizerCoverageLTO.so.cc b/instrumentation/SanitizerCoverageLTO.so.cc index 2d17ffd4..d7b03634 100644 --- a/instrumentation/SanitizerCoverageLTO.so.cc +++ b/instrumentation/SanitizerCoverageLTO.so.cc @@ -331,7 +331,7 @@ llvmGetPassPluginInfo() { #if LLVM_VERSION_MAJOR <= 13 using OptimizationLevel = typename PassBuilder::OptimizationLevel; #endif -#if LLVM_VERSION_MAJOR >= 16 +#if LLVM_VERSION_MAJOR >= 15 PB.registerFullLinkTimeOptimizationLastEPCallback( #else PB.registerOptimizerLastEPCallback( diff --git a/instrumentation/SanitizerCoveragePCGUARD.so.cc b/instrumentation/SanitizerCoveragePCGUARD.so.cc index 57b5d128..7d614f43 100644 --- a/instrumentation/SanitizerCoveragePCGUARD.so.cc +++ b/instrumentation/SanitizerCoveragePCGUARD.so.cc @@ -225,15 +225,8 @@ llvmGetPassPluginInfo() { } -#if LLVM_VERSION_MAJOR >= 16 PreservedAnalyses ModuleSanitizerCoverageAFL::run(Module &M, ModuleAnalysisManager &MAM) { - -#else -PreservedAnalyses ModuleSanitizerCoverageAFL::run(Module &M, - ModuleAnalysisManager &MAM) { - -#endif ModuleSanitizerCoverageAFL ModuleSancov(Options); auto &FAM = MAM.getResult<FunctionAnalysisManagerModuleProxy>(M).getManager(); auto DTCallback = [&FAM](Function &F) -> const DominatorTree *{ |