summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib/gwp_asan/guarded_pool_allocator.h
diff options
context:
space:
mode:
authorDouglas Yung <douglas.yung@sony.com>2019-06-06 08:04:33 +0000
committerDouglas Yung <douglas.yung@sony.com>2019-06-06 08:04:33 +0000
commitdbceb9b2203b58f829e911c8d1610b95d9abf192 (patch)
treee6816e5676775119e7b4db4b16a8d388a34d6e25 /compiler-rt/lib/gwp_asan/guarded_pool_allocator.h
parentd3144a4abc8be435ab2adbe6dd224bcdd44c497e (diff)
downloadbcm5719-llvm-dbceb9b2203b58f829e911c8d1610b95d9abf192.tar.gz
bcm5719-llvm-dbceb9b2203b58f829e911c8d1610b95d9abf192.zip
Fixup files added in r362636 to build with gcc 5.4. NFCI
llvm-svn: 362682
Diffstat (limited to 'compiler-rt/lib/gwp_asan/guarded_pool_allocator.h')
-rw-r--r--compiler-rt/lib/gwp_asan/guarded_pool_allocator.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/gwp_asan/guarded_pool_allocator.h b/compiler-rt/lib/gwp_asan/guarded_pool_allocator.h
index af2a5044a14..50d9baf4ffc 100644
--- a/compiler-rt/lib/gwp_asan/guarded_pool_allocator.h
+++ b/compiler-rt/lib/gwp_asan/guarded_pool_allocator.h
@@ -135,7 +135,7 @@ public:
// singleton pointer and call the internal version of this function. This
// method is never thread safe, and should only be called when fatal errors
// occur.
- static void reportError(uintptr_t AccessPtr, Error Error = Error::UNKNOWN);
+ static void reportError(uintptr_t AccessPtr, Error E = Error::UNKNOWN);
private:
static constexpr size_t kInvalidSlotID = SIZE_MAX;
@@ -204,7 +204,7 @@ private:
// responsible for the error is placed in *Meta.
Error diagnoseUnknownError(uintptr_t AccessPtr, AllocationMetadata **Meta);
- void reportErrorInternal(uintptr_t AccessPtr, Error Error);
+ void reportErrorInternal(uintptr_t AccessPtr, Error E);
// Cached page size for this system in bytes.
size_t PageSize = 0;
OpenPOWER on IntegriCloud