chiyuze created this revision.
chiyuze added a reviewer: rnk.
Herald added a project: All.
chiyuze requested review of this revision.
Herald added a project: clang.
Debug info emission for extern variables in C++ was previously disabled
when the functionality was added in https://reviews.llvm.org/D71818 and
originally in https://reviews.llvm.org/D70696, because there was no use
case. We are enabling it now, as we start to deploy BPF programs
compiled from C++, leveraging C++ features like templates to reduce code
complexity. This patch is required so that we can still use kconfig in
such BPF programs compiled from C++.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D153898
Files:
clang/lib/Sema/SemaDecl.cpp
clang/test/CodeGen/debug-info-extern-basic.cpp
Index: clang/test/CodeGen/debug-info-extern-basic.cpp
===================================================================
--- /dev/null
+++ clang/test/CodeGen/debug-info-extern-basic.cpp
@@ -0,0 +1,25 @@
+// RUN: %clang_cc1 -x c++ -debug-info-kind=limited -triple bpf-linux-gnu
-emit-llvm %s -o - | FileCheck %s
+
+namespace foo {
+
+template <typename T>
+struct S {
+ T x;
+};
+
+extern S<char> s;
+
+int test(void) {
+ return s.x;
+}
+
+} // namespace foo
+
+// CHECK: distinct !DIGlobalVariable(name: "s", scope:
![[NAMESPACE:[0-9]+]],{{.*}} type: ![[STRUCT_TYPE:[0-9]+]], isLocal: false,
isDefinition: false)
+// CHECK: ![[NAMESPACE]] = !DINamespace(name: "foo", scope: null)
+// CHECK: ![[STRUCT_TYPE]] = distinct !DICompositeType(tag:
DW_TAG_structure_type, name: "S<char>",{{.*}}size: 8, flags:
DIFlagTypePassByValue, elements: ![[ELEMENT_TYPE:[0-9]+]], templateParams:
![[TEMPLATE_TYPE:[0-9]+]], identifier: "_ZTSN3foo1SIcEE")
+// CHECK: ![[ELEMENT_TYPE]] = !{![[ELEMENT_TYPE:[0-9]+]]}
+// CHECK: ![[ELEMENT_TYPE]] = !DIDerivedType(tag: DW_TAG_member, name:
"x",{{.*}} baseType: ![[BASE_TYPE:[0-9]+]], size: 8)
+// CHECK: ![[BASE_TYPE]] = !DIBasicType(name: "char", size: 8, encoding:
DW_ATE_signed_char)
+// CHECK: ![[TEMPLATE_TYPE]] = !{![[TEMPLATE_TYPE:[0-9]+]]}
+// CHECK: ![[TEMPLATE_TYPE]] = !DITemplateTypeParameter(name: "T", type:
![[BASE_TYPE]])
Index: clang/lib/Sema/SemaDecl.cpp
===================================================================
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -13773,7 +13773,7 @@
}
if (Context.getTargetInfo().allowDebugInfoForExternalRef() &&
- !Var->isInvalidDecl() && !getLangOpts().CPlusPlus)
+ !Var->isInvalidDecl())
ExternalDeclarations.push_back(Var);
return;
Index: clang/test/CodeGen/debug-info-extern-basic.cpp
===================================================================
--- /dev/null
+++ clang/test/CodeGen/debug-info-extern-basic.cpp
@@ -0,0 +1,25 @@
+// RUN: %clang_cc1 -x c++ -debug-info-kind=limited -triple bpf-linux-gnu -emit-llvm %s -o - | FileCheck %s
+
+namespace foo {
+
+template <typename T>
+struct S {
+ T x;
+};
+
+extern S<char> s;
+
+int test(void) {
+ return s.x;
+}
+
+} // namespace foo
+
+// CHECK: distinct !DIGlobalVariable(name: "s", scope: ![[NAMESPACE:[0-9]+]],{{.*}} type: ![[STRUCT_TYPE:[0-9]+]], isLocal: false, isDefinition: false)
+// CHECK: ![[NAMESPACE]] = !DINamespace(name: "foo", scope: null)
+// CHECK: ![[STRUCT_TYPE]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "S<char>",{{.*}}size: 8, flags: DIFlagTypePassByValue, elements: ![[ELEMENT_TYPE:[0-9]+]], templateParams: ![[TEMPLATE_TYPE:[0-9]+]], identifier: "_ZTSN3foo1SIcEE")
+// CHECK: ![[ELEMENT_TYPE]] = !{![[ELEMENT_TYPE:[0-9]+]]}
+// CHECK: ![[ELEMENT_TYPE]] = !DIDerivedType(tag: DW_TAG_member, name: "x",{{.*}} baseType: ![[BASE_TYPE:[0-9]+]], size: 8)
+// CHECK: ![[BASE_TYPE]] = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+// CHECK: ![[TEMPLATE_TYPE]] = !{![[TEMPLATE_TYPE:[0-9]+]]}
+// CHECK: ![[TEMPLATE_TYPE]] = !DITemplateTypeParameter(name: "T", type: ![[BASE_TYPE]])
Index: clang/lib/Sema/SemaDecl.cpp
===================================================================
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -13773,7 +13773,7 @@
}
if (Context.getTargetInfo().allowDebugInfoForExternalRef() &&
- !Var->isInvalidDecl() && !getLangOpts().CPlusPlus)
+ !Var->isInvalidDecl())
ExternalDeclarations.push_back(Var);
return;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
