diff options
author | Manman Ren <mren@apple.com> | 2013-07-08 20:27:34 +0000 |
---|---|---|
committer | Manman Ren <mren@apple.com> | 2013-07-08 20:27:34 +0000 |
commit | 6afede522e4dfe34c1d42ccc251036596c300203 (patch) | |
tree | f49ca62664add53565023bc688988d63be005ddb /include | |
parent | e1e7310749008a515ddd5bf6398df17644f53b33 (diff) | |
download | external_llvm-6afede522e4dfe34c1d42ccc251036596c300203.zip external_llvm-6afede522e4dfe34c1d42ccc251036596c300203.tar.gz external_llvm-6afede522e4dfe34c1d42ccc251036596c300203.tar.bz2 |
Revert r185852.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185861 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r-- | include/llvm/ADT/StringRef.h | 8 | ||||
-rw-r--r-- | include/llvm/DebugInfo.h | 4 | ||||
-rw-r--r-- | include/llvm/Support/YAMLTraits.h | 10 |
3 files changed, 9 insertions, 13 deletions
diff --git a/include/llvm/ADT/StringRef.h b/include/llvm/ADT/StringRef.h index c5f2632..d013d05 100644 --- a/include/llvm/ADT/StringRef.h +++ b/include/llvm/ADT/StringRef.h @@ -548,14 +548,6 @@ namespace llvm { template <typename T> struct isPodLike; template <> struct isPodLike<StringRef> { static const bool value = true; }; - template <typename T> struct DenseMapInfo; - template<> struct DenseMapInfo<StringRef> { - static StringRef getEmptyKey() { return StringRef(); } - static StringRef getTombstoneKey() { return StringRef(" ", 0); } - static unsigned getHashValue(StringRef const val); - static bool isEqual(StringRef const lhs, - StringRef const rhs) { return lhs.equals(rhs); } - }; } #endif diff --git a/include/llvm/DebugInfo.h b/include/llvm/DebugInfo.h index c33a21d..372d367 100644 --- a/include/llvm/DebugInfo.h +++ b/include/llvm/DebugInfo.h @@ -17,7 +17,6 @@ #ifndef LLVM_DEBUGINFO_H #define LLVM_DEBUGINFO_H -#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" @@ -46,9 +45,6 @@ namespace llvm { class DIType; class DIObjCProperty; - /// Map from a pair <unique type name, an unsigned flag> to MDNode. - typedef DenseMap<std::pair<StringRef, unsigned>, MDNode*> DITypeHashMap; - /// DIDescriptor - A thin wraper around MDNode to access encoded debug info. /// This should not be stored in a container, because the underlying MDNode /// may change in certain situations. diff --git a/include/llvm/Support/YAMLTraits.h b/include/llvm/Support/YAMLTraits.h index 14cbfc2..801868f 100644 --- a/include/llvm/Support/YAMLTraits.h +++ b/include/llvm/Support/YAMLTraits.h @@ -760,7 +760,15 @@ private: } static inline bool classof(const MapHNode *) { return true; } - typedef llvm::DenseMap<StringRef, HNode*> NameToNode; + struct StrMappingInfo { + static StringRef getEmptyKey() { return StringRef(); } + static StringRef getTombstoneKey() { return StringRef(" ", 0); } + static unsigned getHashValue(StringRef const val) { + return llvm::HashString(val); } + static bool isEqual(StringRef const lhs, + StringRef const rhs) { return lhs.equals(rhs); } + }; + typedef llvm::DenseMap<StringRef, HNode*, StrMappingInfo> NameToNode; bool isValidKey(StringRef key); |