From f0b7595e080b8cc1f8aa58eb9690412c7439aabe Mon Sep 17 00:00:00 2001 From: Timur Iskhodzhanov Date: Tue, 13 Mar 2012 16:29:25 +0000 Subject: [PATCH] [ASan] Fix build error on Linux; screen-reviewed by glider@google.com llvm-svn: 152629 --- compiler-rt/lib/asan/asan_internal.h | 6 +++--- compiler-rt/lib/asan/asan_posix.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler-rt/lib/asan/asan_internal.h b/compiler-rt/lib/asan/asan_internal.h index da335f0731a9..678e590140e1 100644 --- a/compiler-rt/lib/asan/asan_internal.h +++ b/compiler-rt/lib/asan/asan_internal.h @@ -148,7 +148,7 @@ struct AsanStackTrace; // asan_rtl.cc void NORETURN CheckFailed(const char *cond, const char *file, int line); -void ShowStatsAndAbort(); +void NORETURN ShowStatsAndAbort(); // asan_globals.cc bool DescribeAddrIfGlobal(uintptr_t addr); @@ -245,9 +245,9 @@ extern bool asan_init_is_running; enum LinkerInitialized { LINKER_INITIALIZED = 0 }; -void AsanDie(); +void NORETURN AsanDie(); void SleepForSeconds(int seconds); -void Exit(int exitcode); +void NORETURN Exit(int exitcode); int Atexit(void (*function)(void)); #define CHECK(cond) do { if (!(cond)) { \ diff --git a/compiler-rt/lib/asan/asan_posix.cc b/compiler-rt/lib/asan/asan_posix.cc index cc7a128254d7..15bdd932e10d 100644 --- a/compiler-rt/lib/asan/asan_posix.cc +++ b/compiler-rt/lib/asan/asan_posix.cc @@ -101,7 +101,7 @@ void SleepForSeconds(int seconds) { } void Exit(int exitcode) { - return _exit(exitcode); + _exit(exitcode); } int Atexit(void (*function)(void)) {