[llvm-commits] [compiler-rt] r150075 - /compiler-rt/trunk/lib/asan/asan_internal.h

[Alexander Potapenko]

Author: glider
Date: Wed Feb  8 08:14:18 2012
New Revision: 150075

URL: http://llvm.org/viewvc/llvm-project?rev=150075&view=rev
Log:
Move the _ReturnAddress definition out of the __asan:: namespace
Patch by Timur Iskhodzhanov (timurrrr at google.com)


Modified:
    compiler-rt/trunk/lib/asan/asan_internal.h

Modified: compiler-rt/trunk/lib/asan/asan_internal.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_internal.h?rev=150075&r1=150074&r2=150075&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_internal.h (original)
+++ compiler-rt/trunk/lib/asan/asan_internal.h Wed Feb  8 08:14:18 2012
@@ -31,6 +31,9 @@
 typedef __int32          int32_t;
 typedef __int64          int64_t;
 
+extern "C" void* _ReturnAddress(void);
+# pragma intrinsic(_ReturnAddress)
+
 # define ALIAS(x)   // TODO(timurrrr): do we need this on Windows?
 # define ALIGNED(x) __declspec(align(x))
 # define NOINLINE __declspec(noinline)
@@ -215,8 +218,6 @@
 # define GET_CALLER_PC() (uintptr_t)__builtin_return_address(0)
 # define GET_CURRENT_FRAME() (uintptr_t)__builtin_frame_address(0)
 #else
-extern "C" void* _ReturnAddress(void);
-# pragma intrinsic(_ReturnAddress)
 # define GET_CALLER_PC() (uintptr_t)_ReturnAddress()
 // CaptureStackBackTrace doesn't need to know BP on Windows.
 // FIXME: This macro is still used when printing error reports though it's not