diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2011-11-15 01:23:22 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2011-11-15 01:23:22 +0000 |
| commit | e7c1aef2b824f29ea92b2b324975915fe2115fa4 (patch) | |
| tree | d563b72d4c6a85ac14ccda4f84faddcdb7ef3185 | |
| parent | c2ecf3efbf375fc82bb1cea6afd7448498f9ae75 (diff) | |
Move WEAK marking to the declaration.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144603 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/Support/Valgrind.h | 14 | ||||
| -rw-r--r-- | lib/Support/Valgrind.cpp | 12 |
2 files changed, 12 insertions, 14 deletions
diff --git a/include/llvm/Support/Valgrind.h b/include/llvm/Support/Valgrind.h index 0ecd33b6dd..9b8d277ecc 100644 --- a/include/llvm/Support/Valgrind.h +++ b/include/llvm/Support/Valgrind.h @@ -24,14 +24,12 @@ // tsan (Thread Sanitizer) is a valgrind-based tool that detects these exact // functions by name. extern "C" { -LLVM_ATTRIBUTE_NOINLINE void AnnotateHappensAfter(const char *file, int line, - const volatile void *cv); -LLVM_ATTRIBUTE_NOINLINE void AnnotateHappensBefore(const char *file, int line, - const volatile void *cv); -LLVM_ATTRIBUTE_NOINLINE void AnnotateIgnoreWritesBegin(const char *file, - int line); -LLVM_ATTRIBUTE_NOINLINE void AnnotateIgnoreWritesEnd(const char *file, - int line); +LLVM_ATTRIBUTE_WEAK void AnnotateHappensAfter(const char *file, int line, + const volatile void *cv); +LLVM_ATTRIBUTE_WEAK void AnnotateHappensBefore(const char *file, int line, + const volatile void *cv); +LLVM_ATTRIBUTE_WEAK void AnnotateIgnoreWritesBegin(const char *file, int line); +LLVM_ATTRIBUTE_WEAK void AnnotateIgnoreWritesEnd(const char *file, int line); } #endif diff --git a/lib/Support/Valgrind.cpp b/lib/Support/Valgrind.cpp index 46d93a26ef..078d705183 100644 --- a/lib/Support/Valgrind.cpp +++ b/lib/Support/Valgrind.cpp @@ -56,10 +56,10 @@ void llvm::sys::ValgrindDiscardTranslations(const void *Addr, size_t Len) { // These functions require no implementation, tsan just looks at the arguments // they're called with. extern "C" { -LLVM_ATTRIBUTE_WEAK void AnnotateHappensBefore(const char *file, int line, - const volatile void *cv) {} -LLVM_ATTRIBUTE_WEAK void AnnotateHappensAfter(const char *file, int line, - const volatile void *cv) {} -LLVM_ATTRIBUTE_WEAK void AnnotateIgnoreWritesBegin(const char *file, int line){} -LLVM_ATTRIBUTE_WEAK void AnnotateIgnoreWritesEnd(const char *file, int line) {} +void AnnotateHappensBefore(const char *file, int line, + const volatile void *cv) {} +void AnnotateHappensAfter(const char *file, int line, + const volatile void *cv) {} +void AnnotateIgnoreWritesBegin(const char *file, int line) {} +void AnnotateIgnoreWritesEnd(const char *file, int line) {} } |