diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Support/APFloat.cpp | 3 | ||||
| -rw-r--r-- | lib/Support/FoldingSet.cpp | 6 | ||||
| -rw-r--r-- | lib/VMCore/AsmWriter.cpp | 14 |
3 files changed, 14 insertions, 9 deletions
diff --git a/lib/Support/APFloat.cpp b/lib/Support/APFloat.cpp index c296770..d8d414d 100644 --- a/lib/Support/APFloat.cpp +++ b/lib/Support/APFloat.cpp @@ -599,7 +599,8 @@ APFloat::copySignificand(const APFloat &rhs) } /* Make this number a NaN, with an arbitrary but deterministic value - for the significand. */ + for the significand. If double or longer, this is a signalling NaN, + which may not be ideal. */ void APFloat::makeNaN(void) { diff --git a/lib/Support/FoldingSet.cpp b/lib/Support/FoldingSet.cpp index d2b02f2..3a1a0cd 100644 --- a/lib/Support/FoldingSet.cpp +++ b/lib/Support/FoldingSet.cpp @@ -61,12 +61,6 @@ void FoldingSetNodeID::AddInteger(unsigned long long I) { if ((uint64_t)(int)I != I) Bits.push_back(unsigned(I >> 32)); } -void FoldingSetNodeID::AddFloat(float F) { - Bits.push_back(FloatToBits(F)); -} -void FoldingSetNodeID::AddDouble(double D) { - AddInteger(DoubleToBits(D)); -} void FoldingSetNodeID::AddString(const char *String) { unsigned Size = static_cast<unsigned>(strlen(String)); diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index b59ec08..6a17516 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -640,6 +640,7 @@ static void WriteConstantInt(raw_ostream &Out, const Constant *CV, // make sure that we only output it in exponential format if we can parse // the value back and get the same value. // + bool ignored; bool isDouble = &CFP->getValueAPF().getSemantics()==&APFloat::IEEEdouble; double Val = isDouble ? CFP->getValueAPF().convertToDouble() : CFP->getValueAPF().convertToFloat(); @@ -659,11 +660,20 @@ static void WriteConstantInt(raw_ostream &Out, const Constant *CV, } } // Otherwise we could not reparse it to exactly the same value, so we must - // output the string in hexadecimal format! + // output the string in hexadecimal format! Note that loading and storing + // floating point types changes the bits of NaNs on some hosts, notably + // x86, so we must not use these types. assert(sizeof(double) == sizeof(uint64_t) && "assuming that double is 64 bits!"); char Buffer[40]; - Out << "0x" << utohex_buffer(uint64_t(DoubleToBits(Val)), Buffer+40); + APFloat apf = CFP->getValueAPF(); + // Floats are represented in ASCII IR as double, convert. + if (!isDouble) + apf.convert(APFloat::IEEEdouble, APFloat::rmNearestTiesToEven, + &ignored); + Out << "0x" << + utohex_buffer(uint64_t(apf.bitcastToAPInt().getZExtValue()), + Buffer+40); return; } |