mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 11:13:28 +01:00
Switch FoldingSet::AddString to StringRef based API.
- This also fixes a dereference of std::string::end, which makes MSVC unhappy and was causing all the static analyzer clang tests to fail. llvm-svn: 82517
This commit is contained in:
parent
a75b499af8
commit
ac9a646035
@ -18,7 +18,7 @@
|
||||
|
||||
#include "llvm/Support/DataTypes.h"
|
||||
#include "llvm/ADT/SmallVector.h"
|
||||
#include <string>
|
||||
#include "llvm/ADT/StringRef.h"
|
||||
#include <iterator>
|
||||
|
||||
namespace llvm {
|
||||
@ -227,9 +227,7 @@ public:
|
||||
void AddInteger(long long I);
|
||||
void AddInteger(unsigned long long I);
|
||||
void AddBoolean(bool B) { AddInteger(B ? 1U : 0U); }
|
||||
void AddString(const char* String, const char* End);
|
||||
void AddString(const std::string &String);
|
||||
void AddString(const char* String);
|
||||
void AddString(StringRef String);
|
||||
|
||||
template <typename T>
|
||||
inline void Add(const T& x) { FoldingSetTrait<T>::Profile(x, *this); }
|
||||
|
@ -63,14 +63,14 @@ void FoldingSetNodeID::AddInteger(unsigned long long I) {
|
||||
Bits.push_back(unsigned(I >> 32));
|
||||
}
|
||||
|
||||
void FoldingSetNodeID::AddString(const char *String, const char *End) {
|
||||
unsigned Size = static_cast<unsigned>(End - String);
|
||||
void FoldingSetNodeID::AddString(StringRef String) {
|
||||
unsigned Size = String.size();
|
||||
Bits.push_back(Size);
|
||||
if (!Size) return;
|
||||
|
||||
unsigned Units = Size / 4;
|
||||
unsigned Pos = 0;
|
||||
const unsigned *Base = (const unsigned *)String;
|
||||
const unsigned *Base = (const unsigned*) String.data();
|
||||
|
||||
// If the string is aligned do a bulk transfer.
|
||||
if (!((intptr_t)Base & 3)) {
|
||||
@ -100,14 +100,6 @@ void FoldingSetNodeID::AddString(const char *String, const char *End) {
|
||||
Bits.push_back(V);
|
||||
}
|
||||
|
||||
void FoldingSetNodeID::AddString(const char *String) {
|
||||
AddString(String, String + strlen(String));
|
||||
}
|
||||
|
||||
void FoldingSetNodeID::AddString(const std::string &String) {
|
||||
AddString(&*String.begin(), &*String.end());
|
||||
}
|
||||
|
||||
/// ComputeHash - Compute a strong hash value for this FoldingSetNodeID, used to
|
||||
/// lookup the node in the FoldingSetImpl.
|
||||
unsigned FoldingSetNodeID::ComputeHash() const {
|
||||
|
Loading…
Reference in New Issue
Block a user