From 0fd19a0c602cccdeb775831a643ac7348da2027a Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Mon, 28 Dec 2015 19:54:36 +0000 Subject: [PATCH] [ADT] Run clang-format over more code, fixing numerous formatting oddities. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@256514 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/PointerIntPair.h | 83 ++++++++++++++++--------------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/include/llvm/ADT/PointerIntPair.h b/include/llvm/ADT/PointerIntPair.h index 66d4b1efa35..0727f737441 100644 --- a/include/llvm/ADT/PointerIntPair.h +++ b/include/llvm/ADT/PointerIntPair.h @@ -21,8 +21,7 @@ namespace llvm { -template -struct DenseMapInfo; +template struct DenseMapInfo; /// PointerIntPair - This class implements a pair of a pointer and small /// integer. It is designed to represent this in the space required by one @@ -38,19 +37,19 @@ struct DenseMapInfo; /// PointerIntPair, 1, bool> /// ... and the two bools will land in different bits. /// -template > +template > class PointerIntPair { intptr_t Value; static_assert(PtrTraits::NumLowBitsAvailable < - std::numeric_limits::digits, + std::numeric_limits::digits, "cannot use a pointer type that has all bits free"); static_assert(IntBits <= PtrTraits::NumLowBitsAvailable, "PointerIntPair with integer size too large for pointer"); enum : uintptr_t { /// PointerBitMask - The bits that come from the pointer. PointerBitMask = - ~(uintptr_t)(((intptr_t)1 << PtrTraits::NumLowBitsAvailable)-1), + ~(uintptr_t)(((intptr_t)1 << PtrTraits::NumLowBitsAvailable) - 1), /// IntShift - The number of low bits that we reserve for other uses, and /// keep zero. @@ -68,22 +67,18 @@ public: PointerIntPair(PointerTy PtrVal, IntType IntVal) { setPointerAndInt(PtrVal, IntVal); } - explicit PointerIntPair(PointerTy PtrVal) { - initWithPointer(PtrVal); - } + explicit PointerIntPair(PointerTy PtrVal) { initWithPointer(PtrVal); } PointerTy getPointer() const { return PtrTraits::getFromVoidPointer( - reinterpret_cast(Value & PointerBitMask)); + reinterpret_cast(Value & PointerBitMask)); } - IntType getInt() const { - return (IntType)((Value >> IntShift) & IntMask); - } + IntType getInt() const { return (IntType)((Value >> IntShift) & IntMask); } void setPointer(PointerTy PtrVal) { - intptr_t PtrWord - = reinterpret_cast(PtrTraits::getAsVoidPointer(PtrVal)); + intptr_t PtrWord = + reinterpret_cast(PtrTraits::getAsVoidPointer(PtrVal)); assert((PtrWord & ~PointerBitMask) == 0 && "Pointer is not sufficiently aligned"); // Preserve all low bits, just update the pointer. @@ -96,20 +91,20 @@ public: // Preserve all bits other than the ones we are updating. Value &= ~ShiftedIntMask; // Remove integer field. - Value |= IntWord << IntShift; // Set new integer. + Value |= IntWord << IntShift; // Set new integer. } void initWithPointer(PointerTy PtrVal) { - intptr_t PtrWord - = reinterpret_cast(PtrTraits::getAsVoidPointer(PtrVal)); + intptr_t PtrWord = + reinterpret_cast(PtrTraits::getAsVoidPointer(PtrVal)); assert((PtrWord & ~PointerBitMask) == 0 && "Pointer is not sufficiently aligned"); Value = PtrWord; } void setPointerAndInt(PointerTy PtrVal, IntType IntVal) { - intptr_t PtrWord - = reinterpret_cast(PtrTraits::getAsVoidPointer(PtrVal)); + intptr_t PtrWord = + reinterpret_cast(PtrTraits::getAsVoidPointer(PtrVal)); assert((PtrWord & ~PointerBitMask) == 0 && "Pointer is not sufficiently aligned"); intptr_t IntWord = static_cast(IntVal); @@ -129,8 +124,10 @@ public: return reinterpret_cast(&Value); } - void *getOpaqueValue() const { return reinterpret_cast(Value); } - void setFromOpaqueValue(void *Val) { Value = reinterpret_cast(Val);} + void *getOpaqueValue() const { return reinterpret_cast(Value); } + void setFromOpaqueValue(void *Val) { + Value = reinterpret_cast(Val); + } static PointerIntPair getFromOpaqueValue(void *V) { PointerIntPair P; @@ -145,23 +142,31 @@ public: return getFromOpaqueValue(const_cast(V)); } - bool operator==(const PointerIntPair &RHS) const {return Value == RHS.Value;} - bool operator!=(const PointerIntPair &RHS) const {return Value != RHS.Value;} - bool operator<(const PointerIntPair &RHS) const {return Value < RHS.Value;} - bool operator>(const PointerIntPair &RHS) const {return Value > RHS.Value;} - bool operator<=(const PointerIntPair &RHS) const {return Value <= RHS.Value;} - bool operator>=(const PointerIntPair &RHS) const {return Value >= RHS.Value;} + bool operator==(const PointerIntPair &RHS) const { + return Value == RHS.Value; + } + bool operator!=(const PointerIntPair &RHS) const { + return Value != RHS.Value; + } + bool operator<(const PointerIntPair &RHS) const { return Value < RHS.Value; } + bool operator>(const PointerIntPair &RHS) const { return Value > RHS.Value; } + bool operator<=(const PointerIntPair &RHS) const { + return Value <= RHS.Value; + } + bool operator>=(const PointerIntPair &RHS) const { + return Value >= RHS.Value; + } }; template struct isPodLike; -template -struct isPodLike > { - static const bool value = true; +template +struct isPodLike> { + static const bool value = true; }; // Provide specialization of DenseMapInfo for PointerIntPair. -template -struct DenseMapInfo > { +template +struct DenseMapInfo> { typedef PointerIntPair Ty; static Ty getEmptyKey() { uintptr_t Val = static_cast(-1); @@ -181,10 +186,10 @@ struct DenseMapInfo > { }; // Teach SmallPtrSet that PointerIntPair is "basically a pointer". -template -class PointerLikeTypeTraits > { +template +class PointerLikeTypeTraits< + PointerIntPair> { public: static inline void * getAsVoidPointer(const PointerIntPair &P) { @@ -198,9 +203,7 @@ public: getFromVoidPointer(const void *P) { return PointerIntPair::getFromOpaqueValue(P); } - enum { - NumLowBitsAvailable = PtrTraits::NumLowBitsAvailable - IntBits - }; + enum { NumLowBitsAvailable = PtrTraits::NumLowBitsAvailable - IntBits }; }; } // end namespace llvm -- 2.34.1