Merge remote-tracking branch 'origin/apple/stable/20190619' into stable

eqyiel · Oct 2, 2019 · 25814dd · 25814dd
2 parents 970f30b + eeafed2
commit 25814dd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/Tooling/Syntax/Tokens.cpp b/lib/Tooling/Syntax/Tokens.cpp
@@ -126,8 +126,8 @@ TokenBuffer::spelledForExpandedToken(const syntax::Token *Expanded) const {
 
   unsigned ExpandedIndex = Expanded - ExpandedTokens.data();
   // Find the first mapping that produced tokens after \p Expanded.
-  auto It = llvm::bsearch(File.Mappings, [&](const Mapping &M) {
-    return ExpandedIndex < M.BeginExpanded;
+  auto It = llvm::partition_point(File.Mappings, [&](const Mapping &M) {
+    return M.BeginExpanded <= ExpandedIndex;
   });
   // Our token could only be produced by the previous mapping.
   if (It == File.Mappings.begin()) {
@@ -211,8 +211,8 @@ TokenBuffer::expansionStartingAt(const syntax::Token *Spelled) const {
          Spelled < (File.SpelledTokens.data() + File.SpelledTokens.size()));
 
   unsigned SpelledIndex = Spelled - File.SpelledTokens.data();
-  auto M = llvm::bsearch(File.Mappings, [&](const Mapping &M) {
-    return SpelledIndex <= M.BeginSpelled;
+  auto M = llvm::partition_point(File.Mappings, [&](const Mapping &M) {
+    return M.BeginSpelled < SpelledIndex;
   });
   if (M == File.Mappings.end() || M->BeginSpelled != SpelledIndex)
     return llvm::None;