diff options
-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 | ||||
-rw-r--r-- | lib/Support/StringRef.cpp | 5 |
4 files changed, 18 insertions, 9 deletions
diff --git a/include/llvm/ADT/StringRef.h b/include/llvm/ADT/StringRef.h index d013d05623..c5f2632f4b 100644 --- a/include/llvm/ADT/StringRef.h +++ b/include/llvm/ADT/StringRef.h @@ -548,6 +548,14 @@ 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 372d367b70..c33a21d729 100644 --- a/include/llvm/DebugInfo.h +++ b/include/llvm/DebugInfo.h @@ -17,6 +17,7 @@ #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" @@ -45,6 +46,9 @@ 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 801868ff1f..14cbfc2373 100644 --- a/include/llvm/Support/YAMLTraits.h +++ b/include/llvm/Support/YAMLTraits.h @@ -760,15 +760,7 @@ private: } static inline bool classof(const MapHNode *) { return true; } - 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; + typedef llvm::DenseMap<StringRef, HNode*> NameToNode; bool isValidKey(StringRef key); diff --git a/lib/Support/StringRef.cpp b/lib/Support/StringRef.cpp index d7a0bfa410..c0f366cb3e 100644 --- a/lib/Support/StringRef.cpp +++ b/lib/Support/StringRef.cpp @@ -11,6 +11,7 @@ #include "llvm/ADT/APInt.h" #include "llvm/ADT/Hashing.h" #include "llvm/ADT/OwningPtr.h" +#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/edit_distance.h" #include <bitset> @@ -465,3 +466,7 @@ bool StringRef::getAsInteger(unsigned Radix, APInt &Result) const { hash_code llvm::hash_value(StringRef S) { return hash_combine_range(S.begin(), S.end()); } + +unsigned DenseMapInfo<StringRef>::getHashValue(StringRef const val) { + return llvm::HashString(val); +} |