https://github.com/ilya-biryukov created
https://github.com/llvm/llvm-project/pull/134228
Before this change the code used to add extra qualifiers, e.g.
`std::unique_ptr<int> _Nonnull` became `::std::std::unique_ptr<int> _Nonnull`
when adding a global namespace qualifier was requested.
>From 7edb987104cf59b106a1f13ae0bad0c5ecd4627b Mon Sep 17 00:00:00 2001
From: Ilya Biryukov <ibiryu...@google.com>
Date: Thu, 3 Apr 2025 12:22:39 +0200
Subject: [PATCH] [Tooling] Handle AttributedType in getFullyQualifiedType
Before this change the code used to add extra qualifiers, e.g.
`std::unique_ptr<int> _Nonnull` became `::std::std::unique_ptr<int> _Nonnull`
when global namespace qualifier was requested.
---
clang/lib/AST/QualTypeNames.cpp | 9 +++++++++
clang/unittests/Tooling/QualTypeNamesTest.cpp | 17 +++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/clang/lib/AST/QualTypeNames.cpp b/clang/lib/AST/QualTypeNames.cpp
index e4d2a6937f6eb..6b44be343e13e 100644
--- a/clang/lib/AST/QualTypeNames.cpp
+++ b/clang/lib/AST/QualTypeNames.cpp
@@ -417,6 +417,15 @@ QualType getFullyQualifiedType(QualType QT, const
ASTContext &Ctx,
return QT;
}
+ // Handle types that have attributes attached such as `unique_ptr<int>
_Nonnull`.
+ if (auto *AT = dyn_cast<AttributedType>(QT.getTypePtr())) {
+ QualType NewModified =
+ getFullyQualifiedType(AT->getModifiedType(), Ctx, WithGlobalNsPrefix);
+ QualType NewEquivalent =
+ getFullyQualifiedType(AT->getEquivalentType(), Ctx,
WithGlobalNsPrefix);
+ return Ctx.getAttributedType(AT->getAttrKind(), NewModified,
NewEquivalent);
+ }
+
// Remove the part of the type related to the type being a template
// parameter (we won't report it as part of the 'type name' and it
// is actually make the code below to be more complex (to handle
diff --git a/clang/unittests/Tooling/QualTypeNamesTest.cpp
b/clang/unittests/Tooling/QualTypeNamesTest.cpp
index 5ded64d4fcc8c..d9303e6d61c4a 100644
--- a/clang/unittests/Tooling/QualTypeNamesTest.cpp
+++ b/clang/unittests/Tooling/QualTypeNamesTest.cpp
@@ -297,4 +297,21 @@ TEST(QualTypeNameTest, ConstUsing) {
using ::A::S;
void foo(const S& param1, const S param2);)");
}
+
+TEST(QualTypeNameTest, NullableAttributesWithGlobalNs) {
+ TypeNameVisitor Visitor;
+ Visitor.WithGlobalNsPrefix = true;
+ Visitor.ExpectedQualTypeNames["param1"] = "::std::unique_ptr<int> _Nullable";
+ Visitor.ExpectedQualTypeNames["param2"] = "::std::unique_ptr<int> _Nonnull";
+ Visitor.ExpectedQualTypeNames["param3"] =
+ "::std::unique_ptr< ::std::unique_ptr<int> _Nullable> _Nonnull";
+ Visitor.runOver(R"(namespace std {
+ template<class T> class unique_ptr {};
+ }
+ void foo(
+ std::unique_ptr<int> _Nullable param1,
+ _Nonnull std::unique_ptr<int> param2,
+ std::unique_ptr<std::unique_ptr<int> _Nullable> _Nonnull
param3);
+ )");
+}
} // end anonymous namespace
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
