[compiler-rt] r313572 - [ubsan] Fix conflict with previous declaration on Mac
Vitaly Buka via llvm-commits
llvm-commits at lists.llvm.org
Mon Sep 18 14:35:50 PDT 2017
Author: vitalybuka
Date: Mon Sep 18 14:35:49 2017
New Revision: 313572
URL: http://llvm.org/viewvc/llvm-project?rev=313572&view=rev
Log:
[ubsan] Fix conflict with previous declaration on Mac
Modified:
compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc
Modified: compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc?rev=313572&r1=313571&r2=313572&view=diff
==============================================================================
--- compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc (original)
+++ compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc Mon Sep 18 14:35:49 2017
@@ -672,9 +672,8 @@ void __ubsan_handle_cfi_bad_type(CFIChec
bool ValidVtable, ReportOptions Opts);
#else
-static void __ubsan_handle_cfi_bad_type(CFICheckFailData *Data,
- ValueHandle Vtable,
- bool ValidVtable, ReportOptions Opts) {
+void __ubsan_handle_cfi_bad_type(CFICheckFailData *Data, ValueHandle Vtable,
+ bool ValidVtable, ReportOptions Opts) {
Die();
}
#endif
More information about the llvm-commits
mailing list