[clang] [Serialization] Use llvm::map_range (NFC) (PR #135990)

[Kazu Hirata via cfe-commits]

https://github.com/kazutakahirata updated https://github.com/llvm/llvm-project/pull/135990

>From 65ea8b9f426b37d62a9178f1b076b723471afe88 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu at google.com>
Date: Tue, 15 Apr 2025 03:20:39 -0700
Subject: [PATCH 1/2] [Serialization] Use llvm::map_range (NFC)

---
 clang/lib/Serialization/MultiOnDiskHashTable.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/clang/lib/Serialization/MultiOnDiskHashTable.h b/clang/lib/Serialization/MultiOnDiskHashTable.h
index fa18a29a9a98e..6378f1607d334 100644
--- a/clang/lib/Serialization/MultiOnDiskHashTable.h
+++ b/clang/lib/Serialization/MultiOnDiskHashTable.h
@@ -103,11 +103,9 @@ template<typename Info> class MultiOnDiskHashTable {
 
   /// The current set of on-disk tables.
   table_range tables() {
-    auto Begin = Tables.begin(), End = Tables.end();
-    if (getMergedTable())
-      ++Begin;
-    return llvm::make_range(llvm::map_iterator(Begin, AsOnDiskTable()),
-                            llvm::map_iterator(End, AsOnDiskTable()));
+    bool DropBegin = getMergedTable();
+    return llvm::map_range(llvm::drop_begin(Tables, DropBegin),
+                           AsOnDiskTable());
   }
 
   MergedTable *getMergedTable() const {

>From 044bcd2fb368b38abc313b79a0d513ef6e985bdb Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu at google.com>
Date: Wed, 16 Apr 2025 10:43:47 -0700
Subject: [PATCH 2/2] Address a comment.

---
 clang/lib/Serialization/MultiOnDiskHashTable.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clang/lib/Serialization/MultiOnDiskHashTable.h b/clang/lib/Serialization/MultiOnDiskHashTable.h
index 6378f1607d334..996e9b94287f4 100644
--- a/clang/lib/Serialization/MultiOnDiskHashTable.h
+++ b/clang/lib/Serialization/MultiOnDiskHashTable.h
@@ -103,7 +103,7 @@ template<typename Info> class MultiOnDiskHashTable {
 
   /// The current set of on-disk tables.
   table_range tables() {
-    bool DropBegin = getMergedTable();
+    unsigned DropBegin = getMergedTable() ? 1 : 0;
     return llvm::map_range(llvm::drop_begin(Tables, DropBegin),
                            AsOnDiskTable());
   }