From a44110995241d30a886d711cbc33f65269b170ea Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 10 Jan 2013 17:01:13 +0000 Subject: [ubsan] Move attribute specifier to fix build with gcc. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@172078 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ubsan/ubsan_handlers.h | 16 ++++++++-------- lib/ubsan/ubsan_handlers_cxx.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'lib/ubsan') diff --git a/lib/ubsan/ubsan_handlers.h b/lib/ubsan/ubsan_handlers.h index 6cc2d3623..d6a042481 100644 --- a/lib/ubsan/ubsan_handlers.h +++ b/lib/ubsan/ubsan_handlers.h @@ -25,10 +25,10 @@ struct TypeMismatchData { }; #define RECOVERABLE(checkname, ...) \ - SANITIZER_INTERFACE_ATTRIBUTE \ - extern "C" void __ubsan_handle_ ## checkname( __VA_ARGS__ ); \ - SANITIZER_INTERFACE_ATTRIBUTE \ - extern "C" void __ubsan_handle_ ## checkname ## _abort( __VA_ARGS__ ); + extern "C" SANITIZER_INTERFACE_ATTRIBUTE \ + void __ubsan_handle_ ## checkname( __VA_ARGS__ ); \ + extern "C" SANITIZER_INTERFACE_ATTRIBUTE \ + void __ubsan_handle_ ## checkname ## _abort( __VA_ARGS__ ); /// \brief Handle a runtime type check failure, caused by either a misaligned /// pointer, a null pointer, or a pointer to insufficient storage for the @@ -72,11 +72,11 @@ struct UnreachableData { }; /// \brief Handle a __builtin_unreachable which is reached. -SANITIZER_INTERFACE_ATTRIBUTE -extern "C" void __ubsan_handle_builtin_unreachable(UnreachableData *Data); +extern "C" SANITIZER_INTERFACE_ATTRIBUTE +void __ubsan_handle_builtin_unreachable(UnreachableData *Data); /// \brief Handle reaching the end of a value-returning function. -SANITIZER_INTERFACE_ATTRIBUTE -extern "C" void __ubsan_handle_missing_return(UnreachableData *Data); +extern "C" SANITIZER_INTERFACE_ATTRIBUTE +void __ubsan_handle_missing_return(UnreachableData *Data); struct VLABoundData { SourceLocation Loc; diff --git a/lib/ubsan/ubsan_handlers_cxx.h b/lib/ubsan/ubsan_handlers_cxx.h index 94eccb564..cb1bca78b 100644 --- a/lib/ubsan/ubsan_handlers_cxx.h +++ b/lib/ubsan/ubsan_handlers_cxx.h @@ -28,11 +28,11 @@ struct DynamicTypeCacheMissData { /// \brief Handle a runtime type check failure, caused by an incorrect vptr. /// When this handler is called, all we know is that the type was not in the /// cache; this does not necessarily imply the existence of a bug. -SANITIZER_INTERFACE_ATTRIBUTE -extern "C" void __ubsan_handle_dynamic_type_cache_miss( +extern "C" SANITIZER_INTERFACE_ATTRIBUTE +void __ubsan_handle_dynamic_type_cache_miss( DynamicTypeCacheMissData *Data, ValueHandle Pointer, ValueHandle Hash); -SANITIZER_INTERFACE_ATTRIBUTE -extern "C" void __ubsan_handle_dynamic_type_cache_miss_abort( +extern "C" SANITIZER_INTERFACE_ATTRIBUTE +void __ubsan_handle_dynamic_type_cache_miss_abort( DynamicTypeCacheMissData *Data, ValueHandle Pointer, ValueHandle Hash); } -- cgit v1.2.3