From 6982bdd1193551e65effa3737f2a29d55e7901a5 Mon Sep 17 00:00:00 2001 From: Andrew Trick Date: Tue, 23 Apr 2013 23:45:11 +0000 Subject: [PATCH] Machine model: rewrite a tablegen loop to avoid comparing record pointers. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@180160 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/TableGen/SubtargetEmitter.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/utils/TableGen/SubtargetEmitter.cpp b/utils/TableGen/SubtargetEmitter.cpp index 98892e11441..0d36c4fd468 100644 --- a/utils/TableGen/SubtargetEmitter.cpp +++ b/utils/TableGen/SubtargetEmitter.cpp @@ -797,7 +797,6 @@ void SubtargetEmitter::ExpandProcResources(RecVec &PRVec, RecVec SubResources; if (PRVec[i]->isSubClassOf("ProcResGroup")) { SubResources = PRVec[i]->getValueAsListOfDefs("Resources"); - std::sort(SubResources.begin(), SubResources.end(), LessRecord()); } else { SubResources.push_back(PRVec[i]); @@ -808,15 +807,12 @@ void SubtargetEmitter::ExpandProcResources(RecVec &PRVec, if (*PRI == PRVec[i] || !(*PRI)->isSubClassOf("ProcResGroup")) continue; RecVec SuperResources = (*PRI)->getValueAsListOfDefs("Resources"); - std::sort(SuperResources.begin(), SuperResources.end(), LessRecord()); RecIter SubI = SubResources.begin(), SubE = SubResources.end(); - RecIter SuperI = SuperResources.begin(), SuperE = SuperResources.end(); - for ( ; SubI != SubE && SuperI != SuperE; ++SuperI) { - if (*SubI < *SuperI) + for( ; SubI != SubE; ++SubI) { + if (std::find(SuperResources.begin(), SuperResources.end(), *SubI) + == SuperResources.end()) { break; - else if (*SuperI < *SubI) - continue; - ++SubI; + } } if (SubI == SubE) { PRVec.push_back(*PRI);