diff options
| -rw-r--r-- | clang/lib/CodeGen/CGDebugInfo.cpp | 1 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/debug-info-static-member.cpp | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 025bdfaed0e..512db76a841 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -895,6 +895,7 @@ CGDebugInfo::CreateRecordStaticField(const VarDecl *Var, const RecordDecl* RD) { // Create the descriptor for the static variable, with or without // constant initializers. + Var = Var->getCanonicalDecl(); llvm::DIFile VUnit = getOrCreateFile(Var->getLocation()); llvm::DIType VTy = getOrCreateType(Var->getType(), VUnit); diff --git a/clang/test/CodeGenCXX/debug-info-static-member.cpp b/clang/test/CodeGenCXX/debug-info-static-member.cpp index 7bbac6bafc9..2a4f0c3dcd8 100644 --- a/clang/test/CodeGenCXX/debug-info-static-member.cpp +++ b/clang/test/CodeGenCXX/debug-info-static-member.cpp @@ -45,3 +45,13 @@ int main() // CHECK: metadata !{metadata !"0x34\00a\00{{.*}}", {{.*}} @_ZN1C1aE, metadata ![[DECL_A]]} ; [ DW_TAG_variable ] [a] {{.*}} [def] // CHECK: metadata !{metadata !"0x34\00b\00{{.*}}", {{.*}} @_ZN1C1bE, metadata ![[DECL_B]]} ; [ DW_TAG_variable ] [b] {{.*}} [def] // CHECK: metadata !{metadata !"0x34\00c\00{{.*}}", {{.*}} @_ZN1C1cE, metadata ![[DECL_C]]} ; [ DW_TAG_variable ] [c] {{.*}} [def] + +// Verify that even when a static member declaration is created lazily when +// creating the definition, the declaration line is that of the canonical +// declaration, not the definition. +struct V { + virtual ~V(); // cause the definition of 'V' to be omitted by no-standalone-debug optimization + static const int const_va = 42; +}; +// CHECK: ; [ DW_TAG_member ] [const_va] [line [[@LINE-2]], +const int V::const_va; |
