1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
|
From 30861b5d542105f19e65b5ca90e3f1385743d457 Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Thu, 16 Jan 2025 15:32:58 +0100
Subject: [PATCH] llvm 20 support
---
GNUmakefile.llvm | 4 ++--
instrumentation/SanitizerCoveragePCGUARD.so.cc | 4 ++++
instrumentation/afl-llvm-dict2file.so.cc | 13 +++++++++----
instrumentation/afl-llvm-lto-instrumentlist.so.cc | 13 +++++++++----
instrumentation/afl-llvm-pass.so.cc | 7 +++++--
instrumentation/cmplog-instructions-pass.cc | 13 +++++++++----
instrumentation/cmplog-routines-pass.cc | 13 +++++++++----
instrumentation/cmplog-switches-pass.cc | 13 +++++++++----
instrumentation/compare-transform-pass.so.cc | 4 ++++
instrumentation/injection-pass.cc | 13 +++++++++----
instrumentation/split-compares-pass.so.cc | 4 ++++
instrumentation/split-switches-pass.so.cc | 4 ++++
14 files changed, 81 insertions(+), 30 deletions(-)
diff --git a/GNUmakefile.llvm b/GNUmakefile.llvm
index 5e0adb7f..2d9cc51a 100644
--- a/GNUmakefile.llvm
+++ b/GNUmakefile.llvm
@@ -69,7 +69,7 @@ endif
LLVM_STDCXX := gnu++11
LLVM_LTO := 0
-LLVM_UNSUPPORTED := $(shell echo "$(LLVMVER)" | grep -E -q '^[0-2]\.|^3\.[0-7]\.|^2[0-9]\.' && echo 1 || echo 0)
+LLVM_UNSUPPORTED := $(shell echo "$(LLVMVER)" | grep -E -q '^[0-2]\.|^3\.[0-7]\.|^2[1-9]\.' && echo 1 || echo 0)
# Uncomment to see the values assigned above
# $(foreach var,_CLANG_VERSIONS_TO_TEST LLVM_CONFIG LLVMVER LLVM_MAJOR LLVM_MINOR LLVM_TOO_NEW LLVM_TOO_OLD LLVM_TOO_NEW_DEFAULT LLVM_TOO_OLD_DEFAULT LLVM_NEW_API LLVM_NEWER_API LLVM_13_OK LLVM_HAVE_LTO LLVM_BINDIR LLVM_LIBDIR LLVM_STDCXX LLVM_APPLE_XCODE LLVM_LTO LLVM_UNSUPPORTED,$(warning $(var) = $($(var))))
@@ -78,7 +78,7 @@ ifeq "$(LLVMVER)" ""
endif
ifeq "$(LLVM_UNSUPPORTED)" "1"
- $(error llvm_mode only supports llvm from version 3.8 onwards)
+ $(error llvm_mode only supports llvm from version 3.8 onwards - or your version is too new. Upgrade AFL++ if possible or downgrade LLVM.)
endif
ifeq "$(LLVM_TOO_NEW)" "1"
index a9c87094..fae33d27 100644
--- a/instrumentation/SanitizerCoveragePCGUARD.so.cc
+++ b/instrumentation/SanitizerCoveragePCGUARD.so.cc
@@ -226,7 +226,11 @@ llvmGetPassPluginInfo() {
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
#endif
#if LLVM_VERSION_MAJOR >= 16
+ #if LLVM_VERSION_MAJOR >= 20
+ PB.registerPipelineStartEPCallback(
+ #else
PB.registerOptimizerEarlyEPCallback(
+ #endif
#else
PB.registerOptimizerLastEPCallback(
#endif
diff --git a/instrumentation/afl-llvm-dict2file.so.cc b/instrumentation/afl-llvm-dict2file.so.cc
index 6559bc84..c6b7312e 100644
--- a/instrumentation/afl-llvm-dict2file.so.cc
+++ b/instrumentation/afl-llvm-dict2file.so.cc
@@ -120,12 +120,17 @@ llvmGetPassPluginInfo() {
#if LLVM_VERSION_MAJOR <= 13
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
#endif
- PB.registerOptimizerLastEPCallback(
- [](ModulePassManager &MPM, OptimizationLevel OL) {
+ PB.registerOptimizerLastEPCallback([](ModulePassManager &MPM,
+ OptimizationLevel OL
+ #if LLVM_VERSION_MAJOR >= 20
+ ,
+ ThinOrFullLTOPhase Phase
+ #endif
+ ) {
- MPM.addPass(AFLdict2filePass());
+ MPM.addPass(AFLdict2filePass());
- });
+ });
}};
diff --git a/instrumentation/afl-llvm-lto-instrumentlist.so.cc b/instrumentation/afl-llvm-lto-instrumentlist.so.cc
index 17abe2a8..a0d4811d 100644
--- a/instrumentation/afl-llvm-lto-instrumentlist.so.cc
+++ b/instrumentation/afl-llvm-lto-instrumentlist.so.cc
@@ -83,12 +83,17 @@ llvmGetPassPluginInfo() {
#if LLVM_VERSION_MAJOR <= 13
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
#endif
- PB.registerOptimizerLastEPCallback(
- [](ModulePassManager &MPM, OptimizationLevel OL) {
+ PB.registerOptimizerLastEPCallback([](ModulePassManager &MPM,
+ OptimizationLevel OL
+#if LLVM_VERSION_MAJOR >= 20
+ ,
+ ThinOrFullLTOPhase Phase
+#endif
+ ) {
- MPM.addPass(AFLcheckIfInstrument());
+ MPM.addPass(AFLcheckIfInstrument());
- });
+ });
}};
diff --git a/instrumentation/afl-llvm-pass.so.cc b/instrumentation/afl-llvm-pass.so.cc
index 8620fb3f..c599e957 100644
--- a/instrumentation/afl-llvm-pass.so.cc
+++ b/instrumentation/afl-llvm-pass.so.cc
@@ -110,8 +110,7 @@ class AFLCoverage : public ModulePass {
} // namespace
#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
-extern "C" ::llvm::PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK
-llvmGetPassPluginInfo() {
+extern "C" LLVM_ATTRIBUTE_WEAK PassPluginLibraryInfo llvmGetPassPluginInfo() {
return {LLVM_PLUGIN_API_VERSION, "AFLCoverage", "v0.1",
/* lambda to insert our pass into the pass pipeline. */
@@ -122,7 +121,11 @@ llvmGetPassPluginInfo() {
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
#endif
#if LLVM_VERSION_MAJOR >= 16
+ #if LLVM_VERSION_MAJOR >= 20
+ PB.registerPipelineStartEPCallback(
+ #else
PB.registerOptimizerEarlyEPCallback(
+ #endif
#else
PB.registerOptimizerLastEPCallback(
#endif
diff --git a/instrumentation/cmplog-instructions-pass.cc b/instrumentation/cmplog-instructions-pass.cc
index fe5c2926..a2165d7b 100644
--- a/instrumentation/cmplog-instructions-pass.cc
+++ b/instrumentation/cmplog-instructions-pass.cc
@@ -123,12 +123,17 @@ llvmGetPassPluginInfo() {
#if LLVM_VERSION_MAJOR <= 13
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
#endif
- PB.registerOptimizerLastEPCallback(
- [](ModulePassManager &MPM, OptimizationLevel OL) {
+ PB.registerOptimizerLastEPCallback([](ModulePassManager &MPM,
+ OptimizationLevel OL
+ #if LLVM_VERSION_MAJOR >= 20
+ ,
+ ThinOrFullLTOPhase Phase
+ #endif
+ ) {
- MPM.addPass(CmpLogInstructions());
+ MPM.addPass(CmpLogInstructions());
- });
+ });
}};
diff --git a/instrumentation/cmplog-routines-pass.cc b/instrumentation/cmplog-routines-pass.cc
index 560bd73b..d3fafe53 100644
--- a/instrumentation/cmplog-routines-pass.cc
+++ b/instrumentation/cmplog-routines-pass.cc
@@ -118,12 +118,17 @@ llvmGetPassPluginInfo() {
#if LLVM_VERSION_MAJOR <= 13
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
#endif
- PB.registerOptimizerLastEPCallback(
- [](ModulePassManager &MPM, OptimizationLevel OL) {
+ PB.registerOptimizerLastEPCallback([](ModulePassManager &MPM,
+ OptimizationLevel OL
+ #if LLVM_VERSION_MAJOR >= 20
+ ,
+ ThinOrFullLTOPhase Phase
+ #endif
+ ) {
- MPM.addPass(CmpLogRoutines());
+ MPM.addPass(CmpLogRoutines());
- });
+ });
}};
diff --git a/instrumentation/cmplog-switches-pass.cc b/instrumentation/cmplog-switches-pass.cc
index 2b87ea8c..727c47d6 100644
--- a/instrumentation/cmplog-switches-pass.cc
+++ b/instrumentation/cmplog-switches-pass.cc
@@ -118,12 +118,17 @@ llvmGetPassPluginInfo() {
#if LLVM_VERSION_MAJOR <= 13
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
#endif
- PB.registerOptimizerLastEPCallback(
- [](ModulePassManager &MPM, OptimizationLevel OL) {
+ PB.registerOptimizerLastEPCallback([](ModulePassManager &MPM,
+ OptimizationLevel OL
+ #if LLVM_VERSION_MAJOR >= 20
+ ,
+ ThinOrFullLTOPhase Phase
+ #endif
+ ) {
- MPM.addPass(CmplogSwitches());
+ MPM.addPass(CmplogSwitches());
- });
+ });
}};
diff --git a/instrumentation/compare-transform-pass.so.cc b/instrumentation/compare-transform-pass.so.cc
index 36149f35..5516880c 100644
--- a/instrumentation/compare-transform-pass.so.cc
+++ b/instrumentation/compare-transform-pass.so.cc
@@ -130,7 +130,11 @@ llvmGetPassPluginInfo() {
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
#endif
#if LLVM_VERSION_MAJOR >= 16
+ #if LLVM_VERSION_MAJOR >= 20
+ PB.registerPipelineStartEPCallback(
+ #else
PB.registerOptimizerEarlyEPCallback(
+ #endif
#else
PB.registerOptimizerLastEPCallback(
#endif
diff --git a/instrumentation/injection-pass.cc b/instrumentation/injection-pass.cc
index 47ddabd9..f745de78 100644
--- a/instrumentation/injection-pass.cc
+++ b/instrumentation/injection-pass.cc
@@ -122,12 +122,17 @@ llvmGetPassPluginInfo() {
#if LLVM_VERSION_MAJOR <= 13
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
#endif
- PB.registerOptimizerLastEPCallback(
- [](ModulePassManager &MPM, OptimizationLevel OL) {
+ PB.registerOptimizerLastEPCallback([](ModulePassManager &MPM,
+ OptimizationLevel OL
+ #if LLVM_VERSION_MAJOR >= 20
+ ,
+ ThinOrFullLTOPhase Phase
+ #endif
+ ) {
- MPM.addPass(InjectionRoutines());
+ MPM.addPass(InjectionRoutines());
- });
+ });
}};
diff --git a/instrumentation/split-compares-pass.so.cc b/instrumentation/split-compares-pass.so.cc
index effafe50..cc031073 100644
--- a/instrumentation/split-compares-pass.so.cc
+++ b/instrumentation/split-compares-pass.so.cc
@@ -190,7 +190,11 @@ llvmGetPassPluginInfo() {
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
#endif
#if LLVM_VERSION_MAJOR >= 16
+ #if LLVM_VERSION_MAJOR >= 20
+ PB.registerPipelineStartEPCallback(
+ #else
PB.registerOptimizerEarlyEPCallback(
+ #endif
#else
PB.registerOptimizerLastEPCallback(
#endif
diff --git a/instrumentation/split-switches-pass.so.cc b/instrumentation/split-switches-pass.so.cc
index aa552a42..1e4052a3 100644
--- a/instrumentation/split-switches-pass.so.cc
+++ b/instrumentation/split-switches-pass.so.cc
@@ -138,7 +138,11 @@ llvmGetPassPluginInfo() {
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
#endif
#if LLVM_VERSION_MAJOR >= 16
+ #if LLVM_VERSION_MAJOR >= 20
+ PB.registerPipelineStartEPCallback(
+ #else
PB.registerOptimizerEarlyEPCallback(
+ #endif
#else
PB.registerOptimizerLastEPCallback(
#endif
--
2.51.0.1.g7a422dac74
|
