[asan] Store full AddressDescription objects in ErrorInvalidPointerPair

[filcab]

Summary

Summary :

Reviewers : kcc, vitalybuka, eugenis

[filcab]

Add reviewers

[vitalybuka]

LGTM

compiler-rt/trunk/lib/asan/asan_errors.h

ErrorODRViolation(u32 tid, const __asan_global *g1, u32 stack_id1_,
         global1(*g1),
         global2(*g2),
         stack_id1(stack_id1_),
         stack_id2(stack_id2_) {}
   void Print();
 };
 
 struct ErrorInvalidPointerPair : ErrorBase {
-  uptr pc, bp, sp, p1, p2;
+  uptr pc, bp, sp;
+  AddressDescription addr1_description;
+  AddressDescription addr2_description;
   // VS2013 doesn't implement unrestricted unions, so we need a trivial default
   // constructor
   ErrorInvalidPointerPair() = default;
-  ErrorInvalidPointerPair(u32 tid, uptr pc_, uptr bp_, uptr sp_, uptr p1_,
-                          uptr p2_)
-      : ErrorBase(tid), pc(pc_), bp(bp_), sp(sp_), p1(p1_), p2(p2_) {}
+  ErrorInvalidPointerPair(u32 tid, uptr pc_, uptr bp_, uptr sp_, uptr p1,
+                          uptr p2)
+      : ErrorBase(tid),
+        pc(pc_),
+        bp(bp_),
+        sp(sp_),
+        addr1_description(p1, 1, /*shouldLockThreadRegistry=*/false),
+        addr2_description(p2, 1, /*shouldLockThreadRegistry=*/false) {}
   void Print();
 };
 
 // clang-format off
 #define ASAN_FOR_EACH_ERROR_KIND(macro)         \
   macro(StackOverflow)                          \
   macro(DeadlySignal)                           \
   macro(DoubleFree)                             \

compiler-rt/trunk/lib/asan/asan_errors.cc

error_msg.append("odr-violation: global '%s' at %s",
                    MaybeDemangleGlobalName(global1.name), g1_loc.data());
   ReportErrorSummary(error_msg.data());
 }
 
 void ErrorInvalidPointerPair::Print() {
   const char *bug_type = "invalid-pointer-pair";
   Decorator d;
   Printf("%s", d.Warning());
-  Report("ERROR: AddressSanitizer: invalid-pointer-pair: %p %p\n", p1, p2);
+  Report("ERROR: AddressSanitizer: invalid-pointer-pair: %p %p\n",
+         addr1_description.Address(), addr2_description.Address());
   Printf("%s", d.EndWarning());
   GET_STACK_TRACE_FATAL(pc, bp);
   stack.Print();
-  PrintAddressDescription(p1, 1, bug_type);
-  PrintAddressDescription(p2, 1, bug_type);
+  addr1_description.Print();
+  addr2_description.Print();
   ReportErrorSummary(bug_type, &stack);
 }
 
 }  // namespace __asan