maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Overload AddInteger on int/long/long long instead of on int/int64_t, 

to avoid overload ambiguities. This fixes build errors introduced
by r58623.

llvm-svn: 58632
This commit is contained in:
Dan Gohman 2008-11-03 19:40:18 +00:00
parent fe57d109b6
commit bde853911f
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/include/llvm/ADT/FoldingSet.h
View File

@ -221,8 +221,10 @@ public:
void AddPointer(const void *Ptr);
void AddInteger(signed I);
void AddInteger(unsigned I);
void AddInteger(int64_t I);
void AddInteger(uint64_t I);
void AddInteger(long I);
void AddInteger(unsigned long I);
void AddInteger(long long I);
void AddInteger(unsigned long long I);
void AddFloat(float F);
void AddDouble(double D);
void AddString(const std::string &String);

22
llvm/lib/Support/FoldingSet.cpp
View File

@ -41,13 +41,23 @@ void FoldingSetNodeID::AddInteger(signed I) {
void FoldingSetNodeID::AddInteger(unsigned I) {
Bits.push_back(I);
}
void FoldingSetNodeID::AddInteger(int64_t I) {
AddInteger((uint64_t)I);
void FoldingSetNodeID::AddInteger(long I) {
AddInteger((unsigned long)I);
}
void FoldingSetNodeID::AddInteger(uint64_t I) {
Bits.push_back(unsigned(I));
// If the integer is small, encode it just as 32-bits.
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 {
assert(0 && "unexpected sizeof(long)");
}
}
void FoldingSetNodeID::AddInteger(long long I) {
AddInteger((unsigned long long)I);
}
void FoldingSetNodeID::AddInteger(unsigned long long I) {
AddInteger(unsigned(I));
if ((uint64_t)(int)I != I)
Bits.push_back(unsigned(I >> 32));
}