mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-10-10 16:24:04 +00:00
Overload AddInteger on int/long/long long instead of on int/int64_t,
to avoid overload ambiguities. This fixes build errors introduced by r58623. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58632 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
265ca5dff5
commit
20cd13f54f
@ -221,8 +221,10 @@ public:
|
|||||||
void AddPointer(const void *Ptr);
|
void AddPointer(const void *Ptr);
|
||||||
void AddInteger(signed I);
|
void AddInteger(signed I);
|
||||||
void AddInteger(unsigned I);
|
void AddInteger(unsigned I);
|
||||||
void AddInteger(int64_t I);
|
void AddInteger(long I);
|
||||||
void AddInteger(uint64_t I);
|
void AddInteger(unsigned long I);
|
||||||
|
void AddInteger(long long I);
|
||||||
|
void AddInteger(unsigned long long I);
|
||||||
void AddFloat(float F);
|
void AddFloat(float F);
|
||||||
void AddDouble(double D);
|
void AddDouble(double D);
|
||||||
void AddString(const std::string &String);
|
void AddString(const std::string &String);
|
||||||
|
@ -41,13 +41,23 @@ void FoldingSetNodeID::AddInteger(signed I) {
|
|||||||
void FoldingSetNodeID::AddInteger(unsigned I) {
|
void FoldingSetNodeID::AddInteger(unsigned I) {
|
||||||
Bits.push_back(I);
|
Bits.push_back(I);
|
||||||
}
|
}
|
||||||
void FoldingSetNodeID::AddInteger(int64_t I) {
|
void FoldingSetNodeID::AddInteger(long I) {
|
||||||
AddInteger((uint64_t)I);
|
AddInteger((unsigned long)I);
|
||||||
}
|
}
|
||||||
void FoldingSetNodeID::AddInteger(uint64_t I) {
|
void FoldingSetNodeID::AddInteger(unsigned long I) {
|
||||||
Bits.push_back(unsigned(I));
|
if (sizeof(long) == sizeof(int))
|
||||||
|
AddInteger(unsigned(I));
|
||||||
// If the integer is small, encode it just as 32-bits.
|
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)
|
if ((uint64_t)(int)I != I)
|
||||||
Bits.push_back(unsigned(I >> 32));
|
Bits.push_back(unsigned(I >> 32));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user