Commit 45bfb66a authored by Mirko Bonadei's avatar Mirko Bonadei Committed by Commit Bot

Prefixing all the dynamic_annotations function to avoid ODR violations.

WebRTC trybots are detecting more ODR violations in dynamic_annotations:
https://build.chromium.org/p/tryserver.webrtc/builders/android_compile_x64_dbg/builds/27341

Bug: webrtc:8821
Change-Id: I2cfa4770b6dbfdb3419431d72de914f5a538fd82
Reviewed-on: https://chromium-review.googlesource.com/1009912
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Reviewed-by: default avatarPatrik Höglund <phoglund@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550551}
parent f8856acf
......@@ -20,11 +20,24 @@ How to update Abseil:
4. Generate BUILD.gn files launching bazel_to_gn.py from //third_party/abseil-cpp.
5. Rename RunningOnValgrind to AbslRunningOnValgrind:
find . -type f -exec sed -i "s/RunningOnValgrind/AbslRunningOnValgrind/g" {} \;
6. Rename ValgrindSlowdown to AbslValgrindSlowdown:
find . -type f -exec sed -i "s/ValgrindSlowdown/AbslValgrindSlowdown/g" {} \;
5. Rename functions in absl/base/dynamic_annotations.{h,cc}
find . -type f -exec sed -i "s/ValgrindSlowdown(/AbslValgrindSlowdown(/g" {} \;
find . -type f -exec sed -i "s/RunningOnValgrind(/AbslRunningOnValgrind(/g" {} \;
find . -type f -exec sed -i "s/AnnotateBenignRace(/AbslAnnotateBenignRace(/g" {} \;
find . -type f -exec sed -i "s/AnnotateBenignRaceSized(/AbslAnnotateBenignRaceSized(/g" {} \;
find . -type f -exec sed -i "s/AnnotateEnableRaceDetection(/AbslAnnotateEnableRaceDetection(/g" {} \;
find . -type f -exec sed -i "s/AnnotateIgnoreReadsBegin(/AbslAnnotateIgnoreReadsBegin(/g" {} \;
find . -type f -exec sed -i "s/AnnotateIgnoreReadsEnd(/AbslAnnotateIgnoreReadsEnd(/g" {} \;
find . -type f -exec sed -i "s/AnnotateIgnoreWritesBegin(/AbslAnnotateIgnoreWritesBegin(/g" {} \;
find . -type f -exec sed -i "s/AnnotateIgnoreWritesEnd(/AbslAnnotateIgnoreWritesEnd(/g" {} \;
find . -type f -exec sed -i "s/AnnotateRWLockAcquired(/AbslAnnotateRWLockAcquired(/g" {} \;
find . -type f -exec sed -i "s/AnnotateRWLockCreate(/AbslAnnotateRWLockCreate(/g" {} \;
find . -type f -exec sed -i "s/AnnotateRWLockDestroy(/AbslAnnotateRWLockDestroy(/g" {} \;
find . -type f -exec sed -i "s/AnnotateRWLockReleased(/AbslAnnotateRWLockReleased(/g" {} \;
find . -type f -exec sed -i "s/AnnotateThreadName(/AbslAnnotateThreadName(/g" {} \;
find . -type f -exec sed -i "s/AnnotateRWLockCreateStatic(/AbslAnnotateRWLockCreateStatic(/g" {} \;
find . -type f -exec sed -i "s/AnnotateMemoryIsInitialized(/AbslAnnotateMemoryIsInitialized(/g" {} \;
find . -type f -exec sed -i "s/AnnotateMemoryIsUninitialized(/AbslAnnotateMemoryIsUninitialized(/g" {} \;
Local Modifications:
......@@ -33,7 +46,8 @@ Local Modifications:
* All the BUILD.bazel files has been translated to BUILD.gn files.
* RunningOnValgrind and ValgrindSlowdown have been renamed to avoid ODR violations.
* Functions in absl/base/dynamic_annotations.{h,cc} have been renamed to avoid
ODR violations.
......@@ -42,30 +42,30 @@
extern "C" {
#endif
void AnnotateRWLockCreate(const char *, int,
const volatile void *){}
void AnnotateRWLockDestroy(const char *, int,
const volatile void *){}
void AnnotateRWLockAcquired(const char *, int,
const volatile void *, long){}
void AnnotateRWLockReleased(const char *, int,
const volatile void *, long){}
void AnnotateBenignRace(const char *, int,
const volatile void *,
const char *){}
void AnnotateBenignRaceSized(const char *, int,
const volatile void *,
size_t,
const char *) {}
void AnnotateThreadName(const char *, int,
const char *){}
void AnnotateIgnoreReadsBegin(const char *, int){}
void AnnotateIgnoreReadsEnd(const char *, int){}
void AnnotateIgnoreWritesBegin(const char *, int){}
void AnnotateIgnoreWritesEnd(const char *, int){}
void AnnotateEnableRaceDetection(const char *, int, int){}
void AnnotateMemoryIsInitialized(const char *, int,
const volatile void *mem, size_t size) {
void AbslAnnotateRWLockCreate(const char *, int,
const volatile void *){}
void AbslAnnotateRWLockDestroy(const char *, int,
const volatile void *){}
void AbslAnnotateRWLockAcquired(const char *, int,
const volatile void *, long){}
void AbslAnnotateRWLockReleased(const char *, int,
const volatile void *, long){}
void AbslAnnotateBenignRace(const char *, int,
const volatile void *,
const char *){}
void AbslAnnotateBenignRaceSized(const char *, int,
const volatile void *,
size_t,
const char *) {}
void AbslAnnotateThreadName(const char *, int,
const char *){}
void AbslAnnotateIgnoreReadsBegin(const char *, int){}
void AbslAnnotateIgnoreReadsEnd(const char *, int){}
void AbslAnnotateIgnoreWritesBegin(const char *, int){}
void AbslAnnotateIgnoreWritesEnd(const char *, int){}
void AbslAnnotateEnableRaceDetection(const char *, int, int){}
void AbslAnnotateMemoryIsInitialized(const char *, int,
const volatile void *mem, size_t size) {
#if __has_feature(memory_sanitizer)
__msan_unpoison(mem, size);
#else
......@@ -74,8 +74,8 @@ void AnnotateMemoryIsInitialized(const char *, int,
#endif
}
void AnnotateMemoryIsUninitialized(const char *, int,
const volatile void *mem, size_t size) {
void AbslAnnotateMemoryIsUninitialized(const char *, int,
const volatile void *mem, size_t size) {
#if __has_feature(memory_sanitizer)
__msan_allocated_memory(mem, size);
#else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment