8000 3.8 Fix Asan build by Dronplane · Pull Request #14483 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

3.8 Fix Asan build #14483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2021
Merged

3.8 Fix Asan build #14483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions 3rdParty/iresearch/external/absl/absl/base/dynamic_annotations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@

// Function prototypes of annotations provided by the compiler-based sanitizer
// implementation.
ABSL_INTERNAL_BEGIN_EXTERN_C
IRESEARCH_ABSL_INTERNAL_BEGIN_EXTERN_C
void AnnotateRWLockCreate(const char* file, int line,
const volatile void* lock);
void AnnotateRWLockCreateStatic(const char* file, int line,
Expand All @@ -212,7 +212,7 @@ void AnnotateBenignRaceSized(const char* file, int line,
const char* description);
void AnnotateThreadName(const char* file, int line, const char* name);
void AnnotateEnableRaceDetection(const char* file, int line, int enable);
ABSL_INTERNAL_END_EXTERN_C
IRESEARCH_ABSL_INTERNAL_END_EXTERN_C

#else // IRESEARCH_ABSL_INTERNAL_RACE_ANNOTATIONS_ENABLED == 0

Expand Down Expand Up @@ -300,12 +300,12 @@ ABSL_INTERNAL_END_EXTERN_C

// Function prototypes of annotations provided by the compiler-based sanitizer
// implementation.
ABSL_INTERNAL_BEGIN_EXTERN_C
IRESEARCH_ABSL_INTERNAL_BEGIN_EXTERN_C
void AnnotateIgnoreReadsBegin(const char* file, int line)
IRESEARCH_ABSL_INTERNAL_IGNORE_READS_BEGIN_ATTRIBUTE;
void AnnotateIgnoreReadsEnd(const char* file,
int line) IRESEARCH_ABSL_INTERNAL_IGNORE_READS_END_ATTRIBUTE;
ABSL_INTERNAL_END_EXTERN_C
IRESEARCH_ABSL_INTERNAL_END_EXTERN_C

#elif defined(IRESEARCH_ABSL_INTERNAL_ANNOTALYSIS_ENABLED)

Expand Down Expand Up @@ -350,10 +350,10 @@ IRESEARCH_ABSL_INTERNAL_STATIC_INLINE void AbslInternalAnnotateIgnoreReadsEnd()

// Function prototypes of annotations provided by the compiler-based sanitizer
// implementation.
ABSL_INTERNAL_BEGIN_EXTERN_C
IRESEARCH_ABSL_INTERNAL_BEGIN_EXTERN_C
void AnnotateIgnoreWritesBegin(const char* file, int line);
void AnnotateIgnoreWritesEnd(const char* file, int line);
ABSL_INTERNAL_END_EXTERN_C
IRESEARCH_ABSL_INTERNAL_END_EXTERN_C

#else

Expand Down Expand Up @@ -421,10 +421,10 @@ IRESEARCH_ABSL_NAMESPACE_END

#ifdef __cplusplus
#ifdef IRESEARCH_ABSL_HAVE_THREAD_SANITIZER
ABSL_INTERNAL_BEGIN_EXTERN_C
IRESEARCH_ABSL_INTERNAL_BEGIN_EXTERN_C
int RunningOnValgrind();
double ValgrindSlowdown();
ABSL_INTERNAL_END_EXTERN_C
IRESEARCH_ABSL_INTERNAL_END_EXTERN_C
#else
namespace iresearch_absl {
IRESEARCH_ABSL_NAMESPACE_BEGIN
Expand Down
0