[llvm-commits] [compiler-rt] r173694 - Use the correct order of NOINLINE vs ret type to fix Windows build
Timur Iskhodzhanov
timurrrr at google.com
Mon Jan 28 09:29:50 PST 2013
Author: timurrrr
Date: Mon Jan 28 11:29:50 2013
New Revision: 173694
URL: http://llvm.org/viewvc/llvm-project?rev=173694&view=rev
Log:
Use the correct order of NOINLINE vs ret type to fix Windows build
Modified:
compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.h
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.h?rev=173694&r1=173693&r2=173694&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.h Mon Jan 28 11:29:50 2013
@@ -313,7 +313,7 @@ class SizeClassAllocator64 {
alignment <= SizeClassMap::kMaxSize;
}
- Batch *NOINLINE AllocateBatch(AllocatorStats *stat, AllocatorCache *c,
+ NOINLINE Batch* AllocateBatch(AllocatorStats *stat, AllocatorCache *c,
uptr class_id) {
CHECK_LT(class_id, kNumClasses);
RegionInfo *region = GetRegionInfo(class_id);
@@ -324,7 +324,7 @@ class SizeClassAllocator64 {
return b;
}
- void NOINLINE DeallocateBatch(AllocatorStats *stat, uptr class_id, Batch *b) {
+ NOINLINE void DeallocateBatch(AllocatorStats *stat, uptr class_id, Batch *b) {
RegionInfo *region = GetRegionInfo(class_id);
region->free_list.Push(b);
region->n_freed += b->count;
@@ -451,7 +451,7 @@ class SizeClassAllocator64 {
return offset / (u32)size;
}
- Batch *NOINLINE PopulateFreeList(AllocatorStats *stat, AllocatorCache *c,
+ NOINLINE Batch* PopulateFreeList(AllocatorStats *stat, AllocatorCache *c,
uptr class_id, RegionInfo *region) {
BlockingMutexLock l(®ion->mutex);
Batch *b = region->free_list.Pop();
@@ -573,7 +573,7 @@ class SizeClassAllocator32 {
return reinterpret_cast<void*>(meta);
}
- Batch *NOINLINE AllocateBatch(AllocatorStats *stat, AllocatorCache *c,
+ NOINLINE Batch* AllocateBatch(AllocatorStats *stat, AllocatorCache *c,
uptr class_id) {
CHECK_LT(class_id, kNumClasses);
SizeClassInfo *sci = GetSizeClassInfo(class_id);
@@ -586,7 +586,7 @@ class SizeClassAllocator32 {
return b;
}
- void NOINLINE DeallocateBatch(AllocatorStats *stat, uptr class_id, Batch *b) {
+ NOINLINE void DeallocateBatch(AllocatorStats *stat, uptr class_id, Batch *b) {
CHECK_LT(class_id, kNumClasses);
SizeClassInfo *sci = GetSizeClassInfo(class_id);
SpinMutexLock l(&sci->mutex);
@@ -782,7 +782,7 @@ struct SizeClassAllocatorLocalCache {
}
}
- void NOINLINE Refill(SizeClassAllocator *allocator, uptr class_id) {
+ NOINLINE void Refill(SizeClassAllocator *allocator, uptr class_id) {
InitCache();
PerClass *c = &per_class_[class_id];
Batch *b = allocator->AllocateBatch(&stats_, this, class_id);
@@ -794,7 +794,7 @@ struct SizeClassAllocatorLocalCache {
Deallocate(allocator, SizeClassMap::ClassID(sizeof(Batch)), b);
}
- void NOINLINE Drain(SizeClassAllocator *allocator, uptr class_id) {
+ NOINLINE void Drain(SizeClassAllocator *allocator, uptr class_id) {
InitCache();
PerClass *c = &per_class_[class_id];
Batch *b;
More information about the llvm-commits
mailing list