From cf08ff50dd35e1a75d3237b2e297683922a9518d Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Fri, 1 Aug 2014 19:59:14 +0000 Subject: Fix iterator invalidation issues that are breaking my modules buildbot's bootstrap. llvm-svn: 214547 --- clang/lib/CodeGen/ModuleBuilder.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'clang/lib/CodeGen/ModuleBuilder.cpp') diff --git a/clang/lib/CodeGen/ModuleBuilder.cpp b/clang/lib/CodeGen/ModuleBuilder.cpp index c5d18d3..52522e6 100644 --- a/clang/lib/CodeGen/ModuleBuilder.cpp +++ b/clang/lib/CodeGen/ModuleBuilder.cpp @@ -94,10 +94,13 @@ namespace { for (DeclGroupRef::iterator I = DG.begin(), E = DG.end(); I != E; ++I) Builder->EmitTopLevelDecl(*I); - // Emit any deferred inline method definitions. - for (CXXMethodDecl *MD : DeferredInlineMethodDefinitions) + // Emit any deferred inline method definitions. Note that more deferred + // methods may be added during this loop. + while (!DeferredInlineMethodDefinitions.empty()) { + CXXMethodDecl *MD = DeferredInlineMethodDefinitions.back(); + DeferredInlineMethodDefinitions.pop_back(); Builder->EmitTopLevelDecl(MD); - DeferredInlineMethodDefinitions.clear(); + } return true; } -- cgit v1.1