Merge commit '46968577336f' from llvm.org/main into apple/main

git apple-llvm automerger · git apple-llvm automerger · commit 4cfeff74e6fe · 2021-04-16T20:59:36.000+02:00
diff --git a/clang/include/clang/AST/DeclBase.h b/clang/include/clang/AST/DeclBase.h
@@ -2378,7 +2378,7 @@ class DeclContext {
 
   using udir_iterator_base =
       llvm::iterator_adaptor_base<udir_iterator, lookup_iterator,
-                                  std::random_access_iterator_tag,
+                                  typename lookup_iterator::iterator_category,
                                   UsingDirectiveDecl *>;
 
   struct udir_iterator : udir_iterator_base {
