[clang] Add missing canonicalization in int literal profile

[hnrklssn]

The addition of the type kind to the profile ID of IntegerLiterals results in e.g. size_t and unsigned long literals mismatch even on platforms where they are canonically the same type. This patch checks the Canonical field to determine whether to canonicalize the type first.

rdar://116063468

[llvmbot]

@llvm/pr-subscribers-clang-modules

@llvm/pr-subscribers-clang

Changes

The addition of the type kind to the profile ID of IntegerLiterals results in e.g. size_t and unsigned long literals mismatch even on platforms where they are canonically the same type. This patch checks the Canonical field to determine whether to canonicalize the type first.

rdar://116063468

---

Full diff: https://github.com/llvm/llvm-project/pull/67822.diff

1 Files Affected:

• (modified) clang/lib/AST/StmtProfile.cpp (+2)

diff --git a/clang/lib/AST/StmtProfile.cpp b/clang/lib/AST/StmtProfile.cpp
index 2e4f15f83ac26ef..763d3d612698095 100644
--- a/clang/lib/AST/StmtProfile.cpp
+++ b/clang/lib/AST/StmtProfile.cpp
@@ -1335,6 +1335,8 @@ void StmtProfiler::VisitIntegerLiteral(const IntegerLiteral *S) {
   S->getValue().Profile(ID);
 
   QualType T = S->getType();
+  if (Canonical)
+    T = T.getCanonicalType();
   ID.AddInteger(T->getTypeClass());
   if (auto BitIntT = T->getAs<BitIntType>())
     BitIntT->Profile(ID);

[NagyDonat]

LGTM.

By the way, as I searched for other applications of the flag Canonical, I noticed that StmtProfiler has a VisitType(QualType T) method which "cheats" and just stores T as an opaque pointer (after canonicalizing it if needed). If the pointer value is canonical enough (which I presume), then calling that (instead of the profiling that was custom-built for the Builtin and BitInt types) could provide a different way for implementing VisitIntegerLiteral -- but the current code is also OK after your correction.