From 68ee3d50213fa8b2f899bfefda95c51077d8b0b6 Mon Sep 17 00:00:00 2001 From: Boaz Brickner Date: Fri, 18 Jul 2025 17:11:12 -0400 Subject: [PATCH] Use `llvm::reverse()` instead of `pop_back_val()` in `ImportDeclAndDependencies()` (#5831) This is more explicit and similar to what we do in `MapType()`. --- toolchain/check/import_cpp.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/toolchain/check/import_cpp.cpp b/toolchain/check/import_cpp.cpp index 75051fcbb950..8a0f94ba22f1 100644 --- a/toolchain/check/import_cpp.cpp +++ b/toolchain/check/import_cpp.cpp @@ -1143,10 +1143,13 @@ static auto ImportDeclAndDependencies(Context& context, SemIR::LocId loc_id, // Import dependencies in reverse order. auto inst_id = SemIR::InstId::None; - do { - inst_id = ImportDeclAfterDependencies(context, loc_id, - clang_decls.pop_back_val()); - } while (inst_id.has_value() && !clang_decls.empty()); + for (clang::Decl* clang_decl_to_import : llvm::reverse(clang_decls)) { + inst_id = + ImportDeclAfterDependencies(context, loc_id, clang_decl_to_import); + if (!inst_id.has_value()) { + break; + } + } return inst_id; }