commit 9ceb498127c77e228f70e3118b35fce8f811b11d
author Googler <no-reply@google.com> Tue Jan 17 06:01:35 2023 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 17 06:02:30 2023 -0800
tree 6e6f271fd828199d18c4c432f74c1fff623d312e
parent efeaf27a47b8f47b79879653c7fc695df406e0c6

countPointers() always operates on canonical types

This avoids a bit of manual desugaring we're currently doing, and the obligation
to cover all sugar types in the future.

PiperOrigin-RevId: 502562793

nullability_verification/pointer_nullability_analysis.cc

diff --git a/nullability_verification/pointer_nullability_analysis.cc b/nullability_verification/pointer_nullability_analysis.cc
index b35fa76..fd73e18 100644
--- a/nullability_verification/pointer_nullability_analysis.cc
+++ b/nullability_verification/pointer_nullability_analysis.cc
@@ -107,14 +107,9 @@
 
   unsigned getCount() { return count; }
 
-  void Visit(QualType T) { TypeVisitor::Visit(T.getTypePtrOrNull()); }
-
-  void VisitElaboratedType(const ElaboratedType* ET) {
-    Visit(ET->getNamedType());
-  }
-
-  void VisitAttributedType(const AttributedType* AT) {
-    Visit(AT->getModifiedType());
+  void Visit(QualType T) {
+    CHECK(T.isCanonical());
+    TypeVisitor::Visit(T.getTypePtrOrNull());
   }
 
   void VisitPointerType(const PointerType* PT) {
@@ -135,21 +130,17 @@
       }
     }
   }
-
-  void VisitTemplateSpecializationType(const TemplateSpecializationType* TST) {
-    Visit(TST->desugar());
-  }
 };
 
 unsigned countPointersInType(QualType T) {
   CountPointersInTypeVisitor PointerCountVisitor;
-  PointerCountVisitor.Visit(T);
+  PointerCountVisitor.Visit(T.getCanonicalType());
   return PointerCountVisitor.getCount();
 }
 
 unsigned countPointersInType(TemplateArgument TA) {
   if (TA.getKind() == TemplateArgument::Type) {
-    return countPointersInType(TA.getAsType());
+    return countPointersInType(TA.getAsType().getCanonicalType());
   }
   return 0;
 }