diff --git a/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp --- a/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp +++ b/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp @@ -232,6 +232,12 @@ cl::desc("Track origins of labels"), cl::Hidden, cl::init(0)); +static cl::opt ClIgnorePersonalityRoutine( + "dfsan-ignore-personality-routine", + cl::desc("If a personality routine is marked uninstrumented from the ABI " + "list, do not create a wrapper for it."), + cl::Hidden, cl::init(false)); + static StringRef getGlobalTypeString(const GlobalValue &G) { // Types of GlobalVariables are always pointer types. Type *GType = G.getValueType(); @@ -1357,9 +1363,24 @@ std::vector FnsToInstrument; SmallPtrSet FnsWithNativeABI; SmallPtrSet FnsWithForceZeroLabel; + SmallPtrSet PersonalityFns; for (Function &F : M) - if (!F.isIntrinsic() && !DFSanRuntimeFunctions.contains(&F)) + if (!F.isIntrinsic() && !DFSanRuntimeFunctions.contains(&F)) { FnsToInstrument.push_back(&F); + if (F.hasPersonalityFn()) + PersonalityFns.insert(F.getPersonalityFn()->stripPointerCasts()); + } + + if (ClIgnorePersonalityRoutine) { + for (auto *C : PersonalityFns) { + assert(isa(C) && "Personality routine is not a function!"); + Function *F = cast(C); + if (!isInstrumented(F)) + FnsToInstrument.erase( + std::remove(FnsToInstrument.begin(), FnsToInstrument.end(), F), + FnsToInstrument.end()); + } + } // Give function aliases prefixes when necessary, and build wrappers where the // instrumentedness is inconsistent. diff --git a/llvm/test/Instrumentation/DataFlowSanitizer/Inputs/personality-routine-abilist.txt b/llvm/test/Instrumentation/DataFlowSanitizer/Inputs/personality-routine-abilist.txt new file mode 100644 --- /dev/null +++ b/llvm/test/Instrumentation/DataFlowSanitizer/Inputs/personality-routine-abilist.txt @@ -0,0 +1 @@ +fun:__gxx_personality_v0=uninstrumented diff --git a/llvm/test/Instrumentation/DataFlowSanitizer/ignore_persnality_routine.ll b/llvm/test/Instrumentation/DataFlowSanitizer/ignore_persnality_routine.ll new file mode 100644 --- /dev/null +++ b/llvm/test/Instrumentation/DataFlowSanitizer/ignore_persnality_routine.ll @@ -0,0 +1,39 @@ +; RUN: opt < %s -dfsan -S --dfsan-abilist=%S/Inputs/personality-routine-abilist.txt | FileCheck %s +; RUN: opt < %s -dfsan -S --dfsan-abilist=%S/Inputs/personality-routine-abilist.txt -dfsan-ignore-personality-routine | FileCheck %s --check-prefix=CHECK-IGNORE +; RUN: opt < %s -passes=dfsan -S --dfsan-abilist=%S/Inputs/personality-routine-abilist.txt | FileCheck %s + +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +declare i32 @__gxx_personality_v0(...) + +declare i8* @__cxa_begin_catch(i8*) + +declare void @__cxa_end_catch() + +declare void @g(...) + +; CHECK-LABEL: @h.dfsan +; CHECK-SAME: personality {{.*}}@"dfsw$__gxx_personality_v0"{{.*}} +; CHECK-IGNORE-LABEL: @h.dfsan +; CHECK-IGNORE-SAME: personality {{.*}}__gxx_personality_v0{{.*}} +define i32 @h() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) { + invoke void (...) @g(i32 42) + to label %try.cont unwind label %lpad + +lpad: + %1 = landingpad { i8*, i32 } + catch i8* null + %2 = extractvalue { i8*, i32 } %1, 0 + %3 = tail call i8* @__cxa_begin_catch(i8* %2) + tail call void @__cxa_end_catch() + br label %try.cont + +try.cont: + ret i32 0 +} + +; CHECK: @"dfsw$__gxx_personality_v0" +; CHECK: call void @__dfsan_vararg_wrapper +; CHECK-IGNORE-NOT: @"dfsw$__gxx_personality_v0" +; CHECK-IGNORE-NOT: call void @__dfsan_vararg_wrapper