From c7a12ae24ac5290e4e35f746cfb9e01eda4eb661 Mon Sep 17 00:00:00 2001 From: Daniel Berlin Date: Thu, 27 Sep 2007 15:42:23 +0000 Subject: [PATCH] Ignore redundant constraints git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42397 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/IPA/Andersens.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/lib/Analysis/IPA/Andersens.cpp b/lib/Analysis/IPA/Andersens.cpp index 4ede5e128af..63a6cb553e0 100644 --- a/lib/Analysis/IPA/Andersens.cpp +++ b/lib/Analysis/IPA/Andersens.cpp @@ -134,6 +134,21 @@ namespace { assert(Offset == 0 || Ty != AddressOf && "Offset is illegal on addressof constraints"); } + bool operator==(const Constraint &RHS) const { + return RHS.Type == Type + && RHS.Dest == Dest + && RHS.Src == Src + && RHS.Offset == Offset; + } + bool operator<(const Constraint &RHS) const { + if (RHS.Type != Type) + return RHS.Type < Type; + else if (RHS.Dest != Dest) + return RHS.Dest < Dest; + else if (RHS.Src != Src) + return RHS.Src < Src; + return RHS.Offset < Offset; + } }; // Node class - This class is used to represent a node in the constraint @@ -1735,6 +1750,7 @@ void Andersens::HUValNum(unsigned NodeIndex) { /// replaced by their the pointer equivalence class representative. void Andersens::RewriteConstraints() { std::vector NewConstraints; + std::set Seen; PEClass2Node.clear(); PENLEClass2Node.clear(); @@ -1768,12 +1784,14 @@ void Andersens::RewriteConstraints() { // it. if (C.Src == C.Dest && C.Type == Constraint::Copy) continue; - + C.Src = FindEquivalentNode(RHSNode, RHSLabel); C.Dest = FindEquivalentNode(FindNode(LHSNode), LHSLabel); - if (C.Src == C.Dest && C.Type == Constraint::Copy) + if (C.Src == C.Dest && C.Type == Constraint::Copy + || Seen.count(C) != 0) continue; + Seen.insert(C); NewConstraints.push_back(C); } Constraints.swap(NewConstraints);