[compiler-rt] r278919 - Deal with buildbot fallout from r278917: s/AllocType()/GetAllocType()/ (had the same name as the enum)

[Filipe Cabecinhas via llvm-commits]

Author: filcab
Date: Wed Aug 17 04:24:33 2016
New Revision: 278919

URL: http://llvm.org/viewvc/llvm-project?rev=278919&view=rev
Log:
Deal with buildbot fallout from r278917: s/AllocType()/GetAllocType()/ (had the same name as the enum)

Modified:
    compiler-rt/trunk/lib/asan/asan_allocator.cc
    compiler-rt/trunk/lib/asan/asan_allocator.h
    compiler-rt/trunk/lib/asan/asan_descriptions.cc

Modified: compiler-rt/trunk/lib/asan/asan_allocator.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_allocator.cc?rev=278919&r1=278918&r2=278919&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_allocator.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_allocator.cc Wed Aug 17 04:24:33 2016
@@ -673,8 +673,8 @@ uptr AsanChunkView::End() { return Beg()
 uptr AsanChunkView::UsedSize() { return chunk_->UsedSize(); }
 uptr AsanChunkView::AllocTid() { return chunk_->alloc_tid; }
 uptr AsanChunkView::FreeTid() { return chunk_->free_tid; }
-AllocType AsanChunkView::AllocType() {
-  return (enum AllocType)chunk_->alloc_type;
+AllocType AsanChunkView::GetAllocType() {
+  return (AllocType)chunk_->alloc_type;
 }
 
 static StackTrace GetStackTraceFromId(u32 id) {

Modified: compiler-rt/trunk/lib/asan/asan_allocator.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_allocator.h?rev=278919&r1=278918&r2=278919&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_allocator.h (original)
+++ compiler-rt/trunk/lib/asan/asan_allocator.h Wed Aug 17 04:24:33 2016
@@ -62,7 +62,7 @@ class AsanChunkView {
   u32 GetFreeStackId();
   StackTrace GetAllocStack();
   StackTrace GetFreeStack();
-  AllocType AllocType();
+  AllocType GetAllocType();
   bool AddrIsInside(uptr addr, uptr access_size, sptr *offset) {
     if (addr >= Beg() && (addr + access_size) <= End()) {
       *offset = addr - Beg();

Modified: compiler-rt/trunk/lib/asan/asan_descriptions.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_descriptions.cc?rev=278919&r1=278918&r2=278919&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_descriptions.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_descriptions.cc Wed Aug 17 04:24:33 2016
@@ -121,7 +121,7 @@ static void GetAccessToHeapChunkInformat
   }
   descr->chunk_begin = chunk.Beg();
   descr->chunk_size = chunk.UsedSize();
-  descr->alloc_type = chunk.AllocType();
+  descr->alloc_type = chunk.GetAllocType();
 }
 
 static void PrintHeapChunkAccess(uptr addr, const ChunkAccess &descr) {