Also handle qualifiers like const

Author: ilya-biryukov

clang/lib/AST/QualTypeNames.cpp

@@ -10,6 +10,7 @@
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/DeclarationName.h"
 #include "clang/AST/Mangle.h"
+#include "clang/AST/Type.h"
 
 namespace clang {
 
@@ -423,7 +424,10 @@ QualType getFullyQualifiedType(QualType QT, const ASTContext &Ctx,
         getFullyQualifiedType(AT->getModifiedType(), Ctx, WithGlobalNsPrefix);
     QualType NewEquivalent =
         getFullyQualifiedType(AT->getEquivalentType(), Ctx, WithGlobalNsPrefix);
-    return Ctx.getAttributedType(AT->getAttrKind(), NewModified, NewEquivalent);
+    Qualifiers Qualifiers = QT.getLocalQualifiers();
+    return Ctx.getQualifiedType(
+        Ctx.getAttributedType(AT->getAttrKind(), NewModified, NewEquivalent),
+        Qualifiers);
   }
 
   // Remove the part of the type related to the type being a template

clang/unittests/Tooling/QualTypeNamesTest.cpp

@@ -305,13 +305,23 @@ TEST(QualTypeNameTest, NullableAttributesWithGlobalNs) {
   Visitor.ExpectedQualTypeNames["param2"] = "::std::unique_ptr<int> _Nonnull";
   Visitor.ExpectedQualTypeNames["param3"] =
       "::std::unique_ptr< ::std::unique_ptr<int> _Nullable> _Nonnull";
+  Visitor.ExpectedQualTypeNames["param4"] =
+      "::std::unique_ptr<int>  _Nullable const *";
+  Visitor.ExpectedQualTypeNames["param5"] =
+      "::std::unique_ptr<int>  _Nullable const *";
+  Visitor.ExpectedQualTypeNames["param6"] =
+      "::std::unique_ptr<int>  _Nullable const *";
   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);
+                      std::unique_ptr<std::unique_ptr<int> _Nullable> _Nonnull param3,
+                      const std::unique_ptr<int> _Nullable *param4,
+                      _Nullable std::unique_ptr<int> const *param5,
+                      std::unique_ptr<int> _Nullable const *param6
+                      );
                      )");
 }
 }  // end anonymous namespace