diff options
author | David Blaikie <dblaikie@gmail.com> | 2013-01-20 01:19:17 +0000 |
---|---|---|
committer | David Blaikie <dblaikie@gmail.com> | 2013-01-20 01:19:17 +0000 |
commit | d42917f01c39b5300e844c3ab038547498385279 (patch) | |
tree | 3415b7bee6de3abb5cff1e48821ef1bd39084bcd /clang/lib | |
parent | a39a76efbcb2065b92335ddde0ac287748642a86 (diff) | |
download | bcm5719-llvm-d42917f01c39b5300e844c3ab038547498385279.tar.gz bcm5719-llvm-d42917f01c39b5300e844c3ab038547498385279.zip |
The last of PR14471: Debug info support for inline in-class initializer for float static members
llvm-svn: 172942
Diffstat (limited to 'clang/lib')
-rw-r--r-- | clang/lib/CodeGen/CGDebugInfo.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 27ccc3b494f..37df4b33ce4 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -842,11 +842,15 @@ CollectRecordStaticField(const VarDecl *Var, unsigned LineNumber = getLineNumber(Var->getLocation()); StringRef VName = Var->getName(); - llvm::ConstantInt *CI = NULL; + llvm::Constant *C = NULL; if (Var->getInit()) { const APValue *Value = Var->evaluateValue(); - if (Value && Value->isInt()) - CI = llvm::ConstantInt::get(CGM.getLLVMContext(), Value->getInt()); + if (Value) { + if (Value->isInt()) + C = llvm::ConstantInt::get(CGM.getLLVMContext(), Value->getInt()); + if (Value->isFloat()) + C = llvm::ConstantFP::get(CGM.getLLVMContext(), Value->getFloat()); + } } unsigned Flags = 0; @@ -857,7 +861,7 @@ CollectRecordStaticField(const VarDecl *Var, Flags |= llvm::DIDescriptor::FlagProtected; llvm::DIType GV = DBuilder.createStaticMemberType(RecordTy, VName, VUnit, - LineNumber, VTy, Flags, CI); + LineNumber, VTy, Flags, C); elements.push_back(GV); StaticDataMemberCache[Var->getCanonicalDecl()] = llvm::WeakVH(GV); } |