commit adba14abeda8e249bb885a0d647a766b149b0154
author Tom Sepez <tsepez@chromium.org> Wed May 08 22:54:19 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed May 08 22:54:19 2019 +0000
tree a2b85c3717f9d0eb078ca809abb54676759c25f4
parent 4e1afbde489b47278b053e2a753c2cb2f9923356

Conditionalize unowned_ptr.h using ADDRESS_SANITIZER macro

This is a more specific macro provided by the top-level BUILD.gn

Change-Id: I9809cf7f7158f5c7b6d7ece3ce6d589305ff2d23
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/54133
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

core/fxcrt/unowned_ptr.h

diff --git a/core/fxcrt/unowned_ptr.h b/core/fxcrt/unowned_ptr.h
index 0a44f9d..f7a2354 100644
--- a/core/fxcrt/unowned_ptr.h
+++ b/core/fxcrt/unowned_ptr.h
@@ -19,7 +19,7 @@
 //    an unowned ptr will fail to compile rather than silently succeeding,
 //    since it is a class and not a raw pointer.
 //
-// 2. When built for a memory tool like ASAN, the class provides a destructor
+// 2. When built using the memory tool ASAN, the class provides a destructor
 //    which checks that the object being pointed to is still alive.
 //
 // Hence, when using UnownedPtr, no dangling pointers are ever permitted,
@@ -105,14 +105,14 @@
   friend class pdfium::span<T>;
 
   inline void ProbeForLowSeverityLifetimeIssue() {
-#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+#if defined(ADDRESS_SANITIZER)
     if (m_pObj)
       reinterpret_cast<const volatile uint8_t*>(m_pObj)[0];
 #endif
   }
 
   inline void ReleaseBadPointer() {
-#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+#if defined(ADDRESS_SANITIZER)
     m_pObj = nullptr;
 #endif
   }