diff options
| -rw-r--r-- | llvm/include/llvm/IR/DataLayout.h | 7 | ||||
| -rw-r--r-- | llvm/lib/IR/DataLayout.cpp | 16 |
2 files changed, 12 insertions, 11 deletions
diff --git a/llvm/include/llvm/IR/DataLayout.h b/llvm/include/llvm/IR/DataLayout.h index cfed302..d32b840 100644 --- a/llvm/include/llvm/IR/DataLayout.h +++ b/llvm/include/llvm/IR/DataLayout.h @@ -118,11 +118,12 @@ private: typedef SmallVector<PointerAlignElem, 8> PointersTy; PointersTy Pointers; - PointersTy::const_iterator findPoiterLowerBound(uint32_t AddressSpace) const { - return const_cast<DataLayout *>(this)->findPoiterLowerBound(AddressSpace); + PointersTy::const_iterator + findPointerLowerBound(uint32_t AddressSpace) const { + return const_cast<DataLayout *>(this)->findPointerLowerBound(AddressSpace); } - PointersTy::iterator findPoiterLowerBound(uint32_t AddressSpace); + PointersTy::iterator findPointerLowerBound(uint32_t AddressSpace); /// InvalidAlignmentElem - This member is a signal that a requested alignment /// type and bit width were not found in the SmallVector. diff --git a/llvm/lib/IR/DataLayout.cpp b/llvm/lib/IR/DataLayout.cpp index 162f3d3..12723c0 100644 --- a/llvm/lib/IR/DataLayout.cpp +++ b/llvm/lib/IR/DataLayout.cpp @@ -390,7 +390,7 @@ static bool comparePointerAlignElem(const PointerAlignElem &A, } DataLayout::PointersTy::iterator -DataLayout::findPoiterLowerBound(uint32_t AddressSpace) { +DataLayout::findPointerLowerBound(uint32_t AddressSpace) { return std::lower_bound(Pointers.begin(), Pointers.end(), AddressSpace, comparePointerAlignElem); } @@ -399,7 +399,7 @@ void DataLayout::setPointerAlignment(uint32_t AddrSpace, unsigned ABIAlign, unsigned PrefAlign, uint32_t TypeByteWidth) { assert(ABIAlign <= PrefAlign && "Preferred alignment worse than ABI!"); - PointersTy::iterator I = findPoiterLowerBound(AddrSpace); + PointersTy::iterator I = findPointerLowerBound(AddrSpace); if (I == Pointers.end() || I->AddressSpace != AddrSpace) { Pointers.insert(I, PointerAlignElem::get(AddrSpace, ABIAlign, PrefAlign, TypeByteWidth)); @@ -597,27 +597,27 @@ std::string DataLayout::getStringRepresentation() const { } unsigned DataLayout::getPointerABIAlignment(unsigned AS) const { - PointersTy::const_iterator I = findPoiterLowerBound(AS); + PointersTy::const_iterator I = findPointerLowerBound(AS); if (I == Pointers.end() || I->AddressSpace != AS) { - I = findPoiterLowerBound(0); + I = findPointerLowerBound(0); assert(I->AddressSpace == 0); } return I->ABIAlign; } unsigned DataLayout::getPointerPrefAlignment(unsigned AS) const { - PointersTy::const_iterator I = findPoiterLowerBound(AS); + PointersTy::const_iterator I = findPointerLowerBound(AS); if (I == Pointers.end() || I->AddressSpace != AS) { - I = findPoiterLowerBound(0); + I = findPointerLowerBound(0); assert(I->AddressSpace == 0); } return I->PrefAlign; } unsigned DataLayout::getPointerSize(unsigned AS) const { - PointersTy::const_iterator I = findPoiterLowerBound(AS); + PointersTy::const_iterator I = findPointerLowerBound(AS); if (I == Pointers.end() || I->AddressSpace != AS) { - I = findPoiterLowerBound(0); + I = findPointerLowerBound(0); assert(I->AddressSpace == 0); } return I->TypeByteWidth; |