Chromium Code Reviews| Index: base/third_party/symbolize/symbolize.cc |
| diff --git a/base/third_party/symbolize/symbolize.cc b/base/third_party/symbolize/symbolize.cc |
| index 0932e64abdd48adafb8dde6873f3ea4ae3c0a398..b41a17b8b61dd6a11924a50c11ae4f5a3102c9ae 100644 |
| --- a/base/third_party/symbolize/symbolize.cc |
| +++ b/base/third_party/symbolize/symbolize.cc |
| @@ -773,7 +773,10 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, |
| } |
| // Check whether a file name was returned. |
| +#if !defined(ADDRESS_SANITIZER) && !defined(LEAK_SANITIZER) && \ |
|
Lei Zhang
2017/05/02 19:18:41
Alternatively, use the #if to set some constant, a
Nico
2017/05/02 20:18:27
It's somewhat less icky, but still icky, so I thin
|
| + !defined(MEMORY_SANITIZER) && !defined(THREAD_SANITIZER) |
| if (object_fd < 0) { |
| +#endif |
| if (out[1]) { |
| // The object file containing PC was determined successfully however the |
| // object file was not opened successfully. This is still considered |
| @@ -787,7 +790,10 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, |
| } |
| // Failed to determine the object file containing PC. Bail out. |
| return false; |
| +#if !defined(ADDRESS_SANITIZER) && !defined(LEAK_SANITIZER) && \ |
| + !defined(MEMORY_SANITIZER) && !defined(THREAD_SANITIZER) |
| } |
| +#endif |
| FileDescriptor wrapped_object_fd(object_fd); |
| int elf_type = FileGetElfType(wrapped_object_fd.get()); |
| if (elf_type == -1) { |