From 1e567a616bc127fee5319a9b0e4e14b3b5e8f195 Mon Sep 17 00:00:00 2001
From: Filipe Cabecinhas <me@filcab.net>
Date: Thu, 15 Sep 2016 08:10:56 +0000
Subject: [asan] Reify ErrorInvalidPointerPair

Summary: Continue work on PR30351

Reviewers: vitalybuka, kcc, eugenis

Subscribers: kubabrecka, llvm-commits

Differential Revision: https://reviews.llvm.org/D24554

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@281593 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/asan/asan_errors.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'lib/asan/asan_errors.h')

diff --git a/lib/asan/asan_errors.h b/lib/asan/asan_errors.h
index 5f02a71eb..57062dd0a 100644
--- a/lib/asan/asan_errors.h
+++ b/lib/asan/asan_errors.h
@@ -278,6 +278,17 @@ struct ErrorODRViolation : ErrorBase {
   void Print();
 };
 
+struct ErrorInvalidPointerPair : ErrorBase {
+  uptr pc, bp, sp, p1, p2;
+  // 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_) {}
+  void Print();
+};
+
 // clang-format off
 #define ASAN_FOR_EACH_ERROR_KIND(macro)         \
   macro(StackOverflow)                          \
@@ -291,7 +302,8 @@ struct ErrorODRViolation : ErrorBase {
   macro(StringFunctionMemoryRangesOverlap)      \
   macro(StringFunctionSizeOverflow)             \
   macro(BadParamsToAnnotateContiguousContainer) \
-  macro(ODRViolation)
+  macro(ODRViolation)                           \
+  macro(InvalidPointerPair)
 // clang-format on
 
 #define ASAN_DEFINE_ERROR_KIND(name) kErrorKind##name,
-- 
cgit v1.2.1