https://github.com/kazutakahirata created
https://github.com/llvm/llvm-project/pull/140459
None
>From f8c8c98d787da0ee539b6dca695406004a7c4f10 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <k...@google.com>
Date: Sun, 18 May 2025 07:46:08 -0700
Subject: [PATCH] [clang] Use llvm::unique (NFC)
---
clang/include/clang/Serialization/ContinuousRangeMap.h | 4 ++--
clang/lib/Format/UsingDeclarationsSorter.cpp | 9 ++++-----
clang/lib/Sema/SemaLambda.cpp | 4 ++--
clang/tools/libclang/CIndex.cpp | 5 ++---
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/clang/include/clang/Serialization/ContinuousRangeMap.h
b/clang/include/clang/Serialization/ContinuousRangeMap.h
index c2665c097416d..3c4b03866d27a 100644
--- a/clang/include/clang/Serialization/ContinuousRangeMap.h
+++ b/clang/include/clang/Serialization/ContinuousRangeMap.h
@@ -119,8 +119,8 @@ class ContinuousRangeMap {
~Builder() {
llvm::sort(Self.Rep, Compare());
Self.Rep.erase(
- std::unique(
- Self.Rep.begin(), Self.Rep.end(),
+ llvm::unique(
+ Self.Rep,
[](const_reference A, const_reference B) {
// FIXME: we should not allow any duplicate keys, but there are
// a lot of duplicate 0 -> 0 mappings to remove first.
diff --git a/clang/lib/Format/UsingDeclarationsSorter.cpp
b/clang/lib/Format/UsingDeclarationsSorter.cpp
index 2f4b1e0e46270..651471899dc87 100644
--- a/clang/lib/Format/UsingDeclarationsSorter.cpp
+++ b/clang/lib/Format/UsingDeclarationsSorter.cpp
@@ -157,11 +157,10 @@ void endUsingDeclarationBlock(
};
llvm::stable_sort(SortedUsingDeclarations, Comp);
SortedUsingDeclarations.erase(
- std::unique(SortedUsingDeclarations.begin(),
- SortedUsingDeclarations.end(),
- [](const UsingDeclaration &a, const UsingDeclaration &b) {
- return a.Label == b.Label;
- }),
+ llvm::unique(SortedUsingDeclarations,
+ [](const UsingDeclaration &a, const UsingDeclaration &b) {
+ return a.Label == b.Label;
+ }),
SortedUsingDeclarations.end());
for (size_t I = 0, E = UsingDeclarations->size(); I < E; ++I) {
if (I >= SortedUsingDeclarations.size()) {
diff --git a/clang/lib/Sema/SemaLambda.cpp b/clang/lib/Sema/SemaLambda.cpp
index 28fcef829ec41..f3addfc15735c 100644
--- a/clang/lib/Sema/SemaLambda.cpp
+++ b/clang/lib/Sema/SemaLambda.cpp
@@ -1633,8 +1633,8 @@ static void repeatForLambdaConversionFunctionCallingConvs(
CC_C, CC_X86StdCall, CC_X86FastCall, CC_X86VectorCall,
DefaultFree, DefaultMember, CallOpCC};
llvm::sort(Convs);
- llvm::iterator_range<CallingConv *> Range(
- std::begin(Convs), std::unique(std::begin(Convs), std::end(Convs)));
+ llvm::iterator_range<CallingConv *> Range(std::begin(Convs),
+ llvm::unique(Convs));
const TargetInfo &TI = S.getASTContext().getTargetInfo();
for (CallingConv C : Range) {
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
index 9163c87ea7717..06a17006fdee9 100644
--- a/clang/tools/libclang/CIndex.cpp
+++ b/clang/tools/libclang/CIndex.cpp
@@ -8872,9 +8872,8 @@ static void getCursorPlatformAvailabilityForDecl(
return LHS->getPlatform()->getName() < RHS->getPlatform()->getName();
});
ASTContext &Ctx = D->getASTContext();
- auto It = std::unique(
- AvailabilityAttrs.begin(), AvailabilityAttrs.end(),
- [&Ctx](AvailabilityAttr *LHS, AvailabilityAttr *RHS) {
+ auto It = llvm::unique(
+ AvailabilityAttrs, [&Ctx](AvailabilityAttr *LHS, AvailabilityAttr *RHS) {
if (LHS->getPlatform() != RHS->getPlatform())
return false;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
