Move WEAK marking to the declaration.

llvm-svn: 144603
This commit is contained in:
Nick Lewycky 2011-11-15 01:23:22 +00:00
parent f8ad336bc4
commit 6804d27048
2 changed files with 12 additions and 14 deletions

View File

@ -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

View File

@ -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) {}
}