diff options
author | Daniel Dunbar <daniel@zuster.org> | 2012-03-08 04:17:15 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2012-03-08 04:17:15 +0000 |
commit | 8c0152f8a557742efddc57c3993c2c0a3a79ca4d (patch) | |
tree | efca8be57e636e265a354d050cea07837f6951eb /include | |
parent | d4b0a06e19faae2f2554be3a67938f6d6b8a211b (diff) | |
download | external_llvm-8c0152f8a557742efddc57c3993c2c0a3a79ca4d.zip external_llvm-8c0152f8a557742efddc57c3993c2c0a3a79ca4d.tar.gz external_llvm-8c0152f8a557742efddc57c3993c2c0a3a79ca4d.tar.bz2 |
Revert r152288, "[ADT] Change the trivial FoldingSetNodeID::Add* methods to be
inline.", which is breaking the bots in a way I don't understand.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152295 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r-- | include/llvm/ADT/FoldingSet.h | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/include/llvm/ADT/FoldingSet.h b/include/llvm/ADT/FoldingSet.h index bda54e2..d2e0b8f 100644 --- a/include/llvm/ADT/FoldingSet.h +++ b/include/llvm/ADT/FoldingSet.h @@ -17,7 +17,6 @@ #define LLVM_ADT_FOLDINGSET_H #include "llvm/Support/DataTypes.h" -#include "llvm/Support/ErrorHandling.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" @@ -311,7 +310,6 @@ public: void AddInteger(unsigned long long I); void AddBoolean(bool B) { AddInteger(B ? 1U : 0U); } void AddString(StringRef String); - /// AddNodeID - Adds the Bit data of another ID to *this. void AddNodeID(const FoldingSetNodeID &ID); template <typename T> @@ -677,50 +675,6 @@ template<typename T> struct FoldingSetTrait<T*> { ID.AddPointer(X); } }; - -//===----------------------------------------------------------------------===// -// FoldingSetNodeID Inline function definitions - -/// Add* - Add various data types to Bit data. -/// -inline void FoldingSetNodeID::AddPointer(const void *Ptr) { - // Note: this adds pointers to the hash using sizes and endianness that - // depend on the host. It doesn't matter however, because hashing on - // pointer values in inherently unstable. Nothing should depend on the - // ordering of nodes in the folding set. - Bits.append(reinterpret_cast<unsigned *>(&Ptr), - reinterpret_cast<unsigned *>(&Ptr+1)); -} -inline void FoldingSetNodeID::AddInteger(signed I) { - Bits.push_back(I); -} -inline void FoldingSetNodeID::AddInteger(unsigned I) { - Bits.push_back(I); -} -inline void FoldingSetNodeID::AddInteger(long I) { - AddInteger((unsigned long)I); -} -inline void FoldingSetNodeID::AddInteger(unsigned long I) { - if (sizeof(long) == sizeof(int)) - AddInteger(unsigned(I)); - else if (sizeof(long) == sizeof(long long)) { - AddInteger((unsigned long long)I); - } else { - llvm_unreachable("unexpected sizeof(long)"); - } -} -inline void FoldingSetNodeID::AddInteger(long long I) { - AddInteger((unsigned long long)I); -} -inline void FoldingSetNodeID::AddInteger(unsigned long long I) { - AddInteger(unsigned(I)); - if ((uint64_t)(unsigned)I != I) - Bits.push_back(unsigned(I >> 32)); -} -inline void FoldingSetNodeID::AddNodeID(const FoldingSetNodeID &ID) { - Bits.append(ID.Bits.begin(), ID.Bits.end()); -} - } // End of namespace llvm. #endif |