summaryrefslogtreecommitdiff
path: root/lib/ubsan/ubsan_handlers.cc
diff options
context:
space:
mode:
authorAlexey Samsonov <vonosmas@gmail.com>2015-02-11 00:05:31 +0000
committerAlexey Samsonov <vonosmas@gmail.com>2015-02-11 00:05:31 +0000
commitfe5d36946873d6e1095b4ed37709a2884d64604b (patch)
tree56735d775e277c1ab30bad9564bab89c8fbee370 /lib/ubsan/ubsan_handlers.cc
parenta2ed3c3389822fb0879a385dcc2682ece8544ccf (diff)
[UBSan] Add report deduplication for -fsanitize=function.
Summary: Make sure we don't print the error report from -fsanitize=function twice for the same source location, as we do in another UBSan handlers. Test Plan: check-ubsan test suite Reviewers: rsmith, pcc Reviewed By: pcc Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D7524 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@228772 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ubsan/ubsan_handlers.cc')
-rw-r--r--lib/ubsan/ubsan_handlers.cc15
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/ubsan/ubsan_handlers.cc b/lib/ubsan/ubsan_handlers.cc
index 579ff7617..5b3ef30be 100644
--- a/lib/ubsan/ubsan_handlers.cc
+++ b/lib/ubsan/ubsan_handlers.cc
@@ -337,16 +337,19 @@ void __ubsan::__ubsan_handle_load_invalid_value_abort(InvalidValueData *Data,
static void handleFunctionTypeMismatch(FunctionTypeMismatchData *Data,
ValueHandle Function,
ReportOptions Opts) {
- const char *FName = "(unknown)";
+ SourceLocation CallLoc = Data->Loc.acquire();
+ if (ignoreReport(CallLoc, Opts))
+ return;
- Location Loc = getFunctionLocation(Function, &FName);
+ ScopedReport R(Opts, CallLoc);
- ScopedReport R(Opts, Loc);
+ const char *FName = "(unknown)";
+ Location FLoc = getFunctionLocation(Function, &FName);
- Diag(Data->Loc, DL_Error,
+ Diag(CallLoc, DL_Error,
"call to function %0 through pointer to incorrect function type %1")
- << FName << Data->Type;
- Diag(Loc, DL_Note, "%0 defined here") << FName;
+ << FName << Data->Type;
+ Diag(FLoc, DL_Note, "%0 defined here") << FName;
}
void