diff options
| -rw-r--r-- | lib/AST/ExprConstant.cpp | 17 | ||||
| -rw-r--r-- | test/CodeGen/builtin-nanf.c | 15 |
2 files changed, 29 insertions, 3 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index d0d8b81bab..eac73eaf2f 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -18,6 +18,8 @@ #include "clang/AST/ASTDiagnostic.h" #include "clang/Basic/TargetInfo.h" #include "llvm/Support/Compiler.h" +#include <cstring> + using namespace clang; using llvm::APSInt; using llvm::APFloat; @@ -1311,14 +1313,23 @@ bool FloatExprEvaluator::VisitCallExpr(const CallExpr *E) { case Builtin::BI__builtin_nan: case Builtin::BI__builtin_nanf: case Builtin::BI__builtin_nanl: - // If this is __builtin_nan("") turn this into a simple nan, otherwise we + // If this is __builtin_nan() turn this into a nan, otherwise we // can't constant fold it. if (const StringLiteral *S = dyn_cast<StringLiteral>(E->getArg(0)->IgnoreParenCasts())) { - if (!S->isWide() && S->getByteLength() == 0) { // empty string. + if (!S->isWide()) { const llvm::fltSemantics &Sem = Info.Ctx.getFloatTypeSemantics(E->getType()); - Result = llvm::APFloat::getNaN(Sem); + char *s = (char *)malloc (S->getByteLength()+1); + memcpy(s, S->getStrData(), S->getByteLength()); + s[S->getByteLength()] = 0; + long l; + char *endp; + l = strtol(S->getStrData(), &endp, 0); + if (endp != (S->getStrData() + S->getByteLength())) + return false; + unsigned type = (unsigned int)l;; + Result = llvm::APFloat::getNaN(Sem, false, type); return true; } } diff --git a/test/CodeGen/builtin-nanf.c b/test/CodeGen/builtin-nanf.c new file mode 100644 index 0000000000..e048c7a1aa --- /dev/null +++ b/test/CodeGen/builtin-nanf.c @@ -0,0 +1,15 @@ +// RUN: clang-cc -triple x86_64-apple-darwin9 -emit-llvm -o %t %s && +// RUN: grep 'float 0x7FF8000000000000, float 0x7FF8000000000000, float 0x7FF8000020000000, float 0x7FF8000000000000, float 0x7FF80001E0000000, float 0x7FF8001E00000000, float 0x7FF801E000000000, float 0x7FF81E0000000000, float 0x7FF9E00000000000, float 0x7FFFFFFFE0000000' %t + +float n[] = { + __builtin_nanf("0"), + __builtin_nanf(""), + __builtin_nanf("1"), + __builtin_nanf("0x7fc00000"), + __builtin_nanf("0x7fc0000f"), + __builtin_nanf("0x7fc000f0"), + __builtin_nanf("0x7fc00f00"), + __builtin_nanf("0x7fc0f000"), + __builtin_nanf("0x7fcf0000"), + __builtin_nanf("0xffffffff"), +}; |