60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
|
Index: include/llvm/ADT/StringMap.h
|
||
|
|
===================================================================
|
||
|
|
--- include/llvm/ADT/StringMap.h (révision 117773)
|
||
|
|
+++ include/llvm/ADT/StringMap.h (révision 117774)
|
||
|
|
@@ -167,7 +167,7 @@
|
||
|
|
|
||
|
|
unsigned AllocSize = static_cast<unsigned>(sizeof(StringMapEntry))+
|
||
|
|
KeyLength+1;
|
||
|
|
- unsigned Alignment = alignof<StringMapEntry>();
|
||
|
|
+ unsigned Alignment = alignOf<StringMapEntry>();
|
||
|
|
|
||
|
|
StringMapEntry *NewItem =
|
||
|
|
static_cast<StringMapEntry*>(Allocator.Allocate(AllocSize,Alignment));
|
||
|
|
Index: include/llvm/Support/AlignOf.h
|
||
|
|
===================================================================
|
||
|
|
--- include/llvm/Support/AlignOf.h (révision 117773)
|
||
|
|
+++ include/llvm/Support/AlignOf.h (révision 117774)
|
||
|
|
@@ -49,12 +49,12 @@
|
||
|
|
|
||
|
|
};
|
||
|
|
|
||
|
|
-/// alignof - A templated function that returns the mininum alignment of
|
||
|
|
+/// alignOf - A templated function that returns the mininum alignment of
|
||
|
|
/// of a type. This provides no extra functionality beyond the AlignOf
|
||
|
|
/// class besides some cosmetic cleanliness. Example usage:
|
||
|
|
-/// alignof<int>() returns the alignment of an int.
|
||
|
|
+/// alignOf<int>() returns the alignment of an int.
|
||
|
|
template <typename T>
|
||
|
|
-static inline unsigned alignof() { return AlignOf<T>::Alignment; }
|
||
|
|
+static inline unsigned alignOf() { return AlignOf<T>::Alignment; }
|
||
|
|
|
||
|
|
} // end namespace llvm
|
||
|
|
#endif
|
||
|
|
Index: include/llvm/Support/Allocator.h
|
||
|
|
===================================================================
|
||
|
|
--- include/llvm/Support/Allocator.h (révision 117773)
|
||
|
|
+++ include/llvm/Support/Allocator.h (révision 117774)
|
||
|
|
@@ -201,7 +201,7 @@
|
||
|
|
char *End = Slab == Allocator.CurSlab ? Allocator.CurPtr :
|
||
|
|
(char *)Slab + Slab->Size;
|
||
|
|
for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
|
||
|
|
- Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
|
||
|
|
+ Ptr = Allocator.AlignPtr(Ptr, alignOf<T>());
|
||
|
|
if (Ptr + sizeof(T) <= End)
|
||
|
|
reinterpret_cast<T*>(Ptr)->~T();
|
||
|
|
}
|
||
|
|
Index: include/llvm/CodeGen/SlotIndexes.h
|
||
|
|
===================================================================
|
||
|
|
--- include/llvm/CodeGen/SlotIndexes.h (révision 117773)
|
||
|
|
+++ include/llvm/CodeGen/SlotIndexes.h (révision 117774)
|
||
|
|
@@ -393,7 +393,7 @@
|
||
|
|
IndexListEntry *entry =
|
||
|
|
static_cast<IndexListEntry*>(
|
||
|
|
ileAllocator.Allocate(sizeof(IndexListEntry),
|
||
|
|
- alignof<IndexListEntry>()));
|
||
|
|
+ alignOf<IndexListEntry>()));
|
||
|
|
|
||
|
|
new (entry) IndexListEntry(mi, index);
|
||
|
|
|