From 40b099b0680e8a6b99167fba6e1e6b228e8935bd Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Mon, 26 Mar 2012 14:05:40 +0000 Subject: ThreadSafetyReporter: Manage diagnostics in a std::list. std::list is expensive, but so is std::sorting a SmallVector of SmallVectors of heavyweight PartialDiagnostics. Saves ~30k in a i386-linux-Release+Asserts clang build. llvm-svn: 153437 --- clang/lib/Sema/AnalysisBasedWarnings.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'clang/lib/Sema/AnalysisBasedWarnings.cpp') diff --git a/clang/lib/Sema/AnalysisBasedWarnings.cpp b/clang/lib/Sema/AnalysisBasedWarnings.cpp index 13ab5428b85..a8e679132c7 100644 --- a/clang/lib/Sema/AnalysisBasedWarnings.cpp +++ b/clang/lib/Sema/AnalysisBasedWarnings.cpp @@ -621,17 +621,16 @@ namespace clang { namespace thread_safety { typedef llvm::SmallVector OptionalNotes; typedef std::pair DelayedDiag; -typedef llvm::SmallVector DiagList; +typedef std::list DiagList; struct SortDiagBySourceLocation { - Sema &S; - SortDiagBySourceLocation(Sema &S) : S(S) {} + SourceManager &SM; + SortDiagBySourceLocation(SourceManager &SM) : SM(SM) {} bool operator()(const DelayedDiag &left, const DelayedDiag &right) { // Although this call will be slow, this is only called when outputting // multiple warnings. - return S.getSourceManager().isBeforeInTranslationUnit(left.first.first, - right.first.first); + return SM.isBeforeInTranslationUnit(left.first.first, right.first.first); } }; @@ -660,8 +659,7 @@ class ThreadSafetyReporter : public clang::thread_safety::ThreadSafetyHandler { /// the lockset in deterministic order, so this function orders diagnostics /// and outputs them. void emitDiagnostics() { - SortDiagBySourceLocation SortDiagBySL(S); - sort(Warnings.begin(), Warnings.end(), SortDiagBySL); + Warnings.sort(SortDiagBySourceLocation(S.getSourceManager())); for (DiagList::iterator I = Warnings.begin(), E = Warnings.end(); I != E; ++I) { S.Diag(I->first.first, I->first.second); -- cgit v1.2.3