| Index: third_party/WebKit/Source/wtf/DynamicAnnotations.h
|
| diff --git a/third_party/WebKit/Source/wtf/DynamicAnnotations.h b/third_party/WebKit/Source/wtf/DynamicAnnotations.h
|
| index c03ad1245059ba8c1e9fef9ce1462b1d7a1ba834..7b9fd02b37d36a7fa36347906bdd1f8a55dc5fe5 100644
|
| --- a/third_party/WebKit/Source/wtf/DynamicAnnotations.h
|
| +++ b/third_party/WebKit/Source/wtf/DynamicAnnotations.h
|
| @@ -53,8 +53,11 @@
|
|
|
| #if USE(DYNAMIC_ANNOTATIONS)
|
| /* Tell data race detector that we're not interested in reports on the given address range. */
|
| -#define WTF_ANNOTATE_BENIGN_RACE_SIZED(address, size, description) WTFAnnotateBenignRaceSized(__FILE__, __LINE__, address, size, description)
|
| -#define WTF_ANNOTATE_BENIGN_RACE(pointer, description) WTFAnnotateBenignRaceSized(__FILE__, __LINE__, pointer, sizeof(*(pointer)), description)
|
| +#define WTF_ANNOTATE_BENIGN_RACE_SIZED(address, size, description) \
|
| + WTFAnnotateBenignRaceSized(__FILE__, __LINE__, address, size, description)
|
| +#define WTF_ANNOTATE_BENIGN_RACE(pointer, description) \
|
| + WTFAnnotateBenignRaceSized(__FILE__, __LINE__, pointer, sizeof(*(pointer)), \
|
| + description)
|
|
|
| /* Annotations for user-defined synchronization mechanisms.
|
| * These annotations can be used to define happens-before arcs in user-defined
|
| @@ -73,27 +76,37 @@
|
| * return false;
|
| * }
|
| */
|
| -#define WTF_ANNOTATE_HAPPENS_BEFORE(address) WTFAnnotateHappensBefore(__FILE__, __LINE__, address)
|
| -#define WTF_ANNOTATE_HAPPENS_AFTER(address) WTFAnnotateHappensAfter(__FILE__, __LINE__, address)
|
| +#define WTF_ANNOTATE_HAPPENS_BEFORE(address) \
|
| + WTFAnnotateHappensBefore(__FILE__, __LINE__, address)
|
| +#define WTF_ANNOTATE_HAPPENS_AFTER(address) \
|
| + WTFAnnotateHappensAfter(__FILE__, __LINE__, address)
|
|
|
| #ifdef __cplusplus
|
| extern "C" {
|
| #endif
|
| /* Don't use these directly, use the above macros instead. */
|
| -WTF_EXPORT void WTFAnnotateBenignRaceSized(const char* file, int line, const volatile void* memory, long size, const char* description);
|
| -WTF_EXPORT void WTFAnnotateHappensBefore(const char* file, int line, const volatile void* address);
|
| -WTF_EXPORT void WTFAnnotateHappensAfter(const char* file, int line, const volatile void* address);
|
| +WTF_EXPORT void WTFAnnotateBenignRaceSized(const char* file,
|
| + int line,
|
| + const volatile void* memory,
|
| + long size,
|
| + const char* description);
|
| +WTF_EXPORT void WTFAnnotateHappensBefore(const char* file,
|
| + int line,
|
| + const volatile void* address);
|
| +WTF_EXPORT void WTFAnnotateHappensAfter(const char* file,
|
| + int line,
|
| + const volatile void* address);
|
| #ifdef __cplusplus
|
| -} // extern "C"
|
| +} // extern "C"
|
| #endif
|
|
|
| -#else // USE(DYNAMIC_ANNOTATIONS)
|
| +#else // USE(DYNAMIC_ANNOTATIONS)
|
| /* These macros are empty when dynamic annotations are not enabled so you can
|
| * use them without affecting the performance of release binaries. */
|
| #define WTF_ANNOTATE_BENIGN_RACE_SIZED(address, size, description)
|
| #define WTF_ANNOTATE_BENIGN_RACE(pointer, description)
|
| #define WTF_ANNOTATE_HAPPENS_BEFORE(address)
|
| #define WTF_ANNOTATE_HAPPENS_AFTER(address)
|
| -#endif // USE(DYNAMIC_ANNOTATIONS)
|
| +#endif // USE(DYNAMIC_ANNOTATIONS)
|
|
|
| -#endif // WTF_DynamicAnnotations_h
|
| +#endif // WTF_DynamicAnnotations_h
|
|
|