[llvm-branch-commits] [clang] no-canonicalize (PR #159850)

[Utkarsh Saxena via llvm-branch-commits]

https://github.com/usx95 updated https://github.com/llvm/llvm-project/pull/159850

>From 9916bece21522597542492e3209166518b9a5e6d Mon Sep 17 00:00:00 2001
From: Utkarsh Saxena <usx at google.com>
Date: Fri, 19 Sep 2025 21:30:46 +0000
Subject: [PATCH] no-canonicalize

---
 clang/lib/Analysis/LifetimeSafety.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/clang/lib/Analysis/LifetimeSafety.cpp b/clang/lib/Analysis/LifetimeSafety.cpp
index 0dd5716d93fb6..43cab406a9dc3 100644
--- a/clang/lib/Analysis/LifetimeSafety.cpp
+++ b/clang/lib/Analysis/LifetimeSafety.cpp
@@ -966,9 +966,12 @@ using ExpiredLoanMap = llvm::ImmutableMap<LoanID, const ExpireFact *>;
 /// An object to hold the factories for immutable collections, ensuring
 /// that all created states share the same underlying memory management.
 struct LifetimeFactory {
-  OriginLoanMap::Factory OriginMapFactory;
-  LoanSet::Factory LoanSetFactory;
-  ExpiredLoanMap::Factory ExpiredLoanMapFactory;
+  // Avoid canonicalising
+  OriginLoanMap::Factory OriginMapFactory =
+      OriginLoanMap::Factory(/*canonicalize=*/false);
+  LoanSet::Factory LoanSetFactory = LoanSet::Factory(/*canonicalize=*/false);
+  ExpiredLoanMap::Factory ExpiredLoanMapFactory =
+      ExpiredLoanMap::Factory(/*canonicalize=*/false);
 };
 
 /// Represents the dataflow lattice for loan propagation.