Fix iterator invalidation issues that are breaking my modules buildbot's bootstrap.

llvm-svn: 214547

1 files changed, 6 insertions, 3 deletions

diff --git a/clang/lib/CodeGen/ModuleBuilder.cpp b/clang/lib/CodeGen/ModuleBuilder.cpp
index c5d18d3286a..52522e69ef3 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;
     }