[PATCH] D136807: [clang][Sema] Fix a clang crash with btf_type_tag
Yonghong Song via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Oct 27 10:27:44 PDT 2022
yonghong-song updated this revision to Diff 471216.
yonghong-song added a comment.
- Add the bug fix description in Release Note
- Actually compare debuginfo btf_type_tag output instead of marking 'expected-no-diagnostics'.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D136807/new/
https://reviews.llvm.org/D136807
Files:
clang/docs/ReleaseNotes.rst
clang/lib/Sema/SemaType.cpp
clang/test/CodeGen/attr-btf_type_tag-func-ptr.c
Index: clang/test/CodeGen/attr-btf_type_tag-func-ptr.c
===================================================================
--- /dev/null
+++ clang/test/CodeGen/attr-btf_type_tag-func-ptr.c
@@ -0,0 +1,15 @@
+// RUN: %clang_cc1 -triple %itanium_abi_triple -debug-info-kind=limited -S -emit-llvm -o - %s | FileCheck %s
+
+struct t {
+ int (__attribute__((btf_type_tag("rcu"))) *f)();
+ int a;
+};
+int foo(struct t *arg) {
+ return arg->a;
+}
+
+// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "f"
+// CHECK-SAME: baseType: ![[L18:[0-9]+]]
+// CHECK: ![[L18]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: ![[#]], size: [[#]], annotations: ![[L21:[0-9]+]])
+// CHECK: ![[L21]] = !{![[L22:[0-9]+]]}
+// CHECK: ![[L22]] = !{!"btf_type_tag", !"rcu"}
Index: clang/lib/Sema/SemaType.cpp
===================================================================
--- clang/lib/Sema/SemaType.cpp
+++ clang/lib/Sema/SemaType.cpp
@@ -6515,6 +6515,9 @@
CurrTL = TL.getNextTypeLoc().getUnqualifiedLoc();
}
+ while (BTFTagAttributedTypeLoc TL = CurrTL.getAs<BTFTagAttributedTypeLoc>())
+ CurrTL = TL.getNextTypeLoc().getUnqualifiedLoc();
+
while (DependentAddressSpaceTypeLoc TL =
CurrTL.getAs<DependentAddressSpaceTypeLoc>()) {
fillDependentAddressSpaceTypeLoc(TL, D.getTypeObject(i).getAttrs());
Index: clang/docs/ReleaseNotes.rst
===================================================================
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -258,6 +258,8 @@
- Fix template arguments of pointer and reference not taking the type as
part of their identity.
`Issue 47136 <https://github.com/llvm/llvm-project/issues/47136>`_
+- Fix a crash when btf_type_tag attr is applied to the pointee of
+ a function pointer.
Improvements to Clang's diagnostics
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D136807.471216.patch
Type: text/x-patch
Size: 1881 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20221027/94cbd450/attachment.bin>
More information about the cfe-commits
mailing list