From abc26a932a187f4fb84ac178c44326c9e46efca5 Mon Sep 17 00:00:00 2001 From: cocochpie Date: Mon, 5 Jun 2023 20:33:33 +0000 Subject: [PATCH 1/2] Revive f567a89dae29afb2e421d649f0e750e77913f08c --- instrumentation/SanitizerCoveragePCGUARD.so.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instrumentation/SanitizerCoveragePCGUARD.so.cc b/instrumentation/SanitizerCoveragePCGUARD.so.cc index 20f54b84..25851dda 100644 --- a/instrumentation/SanitizerCoveragePCGUARD.so.cc +++ b/instrumentation/SanitizerCoveragePCGUARD.so.cc @@ -20,6 +20,8 @@ #endif #if LLVM_VERSION_MAJOR < 17 #include "llvm/Analysis/EHPersonalities.h" +#else + #include "llvm/IR/EHPersonalities.h" #endif #include "llvm/Analysis/PostDominators.h" #if LLVM_VERSION_MAJOR < 15 @@ -31,8 +33,10 @@ #include "llvm/IR/DebugInfo.h" #endif #include "llvm/IR/Dominators.h" -#if LLVM_VERSION_MAJOR >= 17 +#if LLVM_VERSION_MAJOR < 17 #include "llvm/Analysis/EHPersonalities.h" +#else + #include "llvm/IR/EHPersonalities.h" #endif #include "llvm/IR/Function.h" #if LLVM_VERSION_MAJOR >= 16 From 9585f5cdfeb7b287ec8614a92f295127eba0a384 Mon Sep 17 00:00:00 2001 From: cocochpie Date: Tue, 6 Jun 2023 04:07:38 +0000 Subject: [PATCH 2/2] =?UTF-8?q?change=20the=20=E2=80=98#if=E2=80=99=20to?= =?UTF-8?q?=20>=3D=2017=20instead=20of=20<=2017?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- instrumentation/SanitizerCoveragePCGUARD.so.cc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/instrumentation/SanitizerCoveragePCGUARD.so.cc b/instrumentation/SanitizerCoveragePCGUARD.so.cc index 25851dda..7171e7aa 100644 --- a/instrumentation/SanitizerCoveragePCGUARD.so.cc +++ b/instrumentation/SanitizerCoveragePCGUARD.so.cc @@ -18,11 +18,6 @@ #include "llvm/ADT/Triple.h" #endif #endif -#if LLVM_VERSION_MAJOR < 17 - #include "llvm/Analysis/EHPersonalities.h" -#else - #include "llvm/IR/EHPersonalities.h" -#endif #include "llvm/Analysis/PostDominators.h" #if LLVM_VERSION_MAJOR < 15 #include "llvm/IR/CFG.h" @@ -33,10 +28,10 @@ #include "llvm/IR/DebugInfo.h" #endif #include "llvm/IR/Dominators.h" -#if LLVM_VERSION_MAJOR < 17 - #include "llvm/Analysis/EHPersonalities.h" -#else +#if LLVM_VERSION_MAJOR >= 17 #include "llvm/IR/EHPersonalities.h" +#else + #include "llvm/Analysis/EHPersonalities.h" #endif #include "llvm/IR/Function.h" #if LLVM_VERSION_MAJOR >= 16