diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-08-01 20:39:36 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-08-01 20:39:36 +0000 |
| commit | 1ba0a07e46c96e81c2f60dd8010ce592c2330119 (patch) | |
| tree | 25ad4bb448b84827572802a3fcedc84e0ff2170b /clang/lib/CodeGen/ModuleBuilder.cpp | |
| parent | e2d6429493d748e24917f8217f7ddd4d29d21ba2 (diff) | |
| download | bcm5719-llvm-1ba0a07e46c96e81c2f60dd8010ce592c2330119.tar.gz bcm5719-llvm-1ba0a07e46c96e81c2f60dd8010ce592c2330119.zip | |
Re-commit r214547 with tests fixed. Hopefully all the bots will be happy now.
Original message:
Fix iterator invalidation issues that are breaking my modules buildbot's
bootstrap.
llvm-svn: 214555
Diffstat (limited to 'clang/lib/CodeGen/ModuleBuilder.cpp')
| -rw-r--r-- | clang/lib/CodeGen/ModuleBuilder.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/ModuleBuilder.cpp b/clang/lib/CodeGen/ModuleBuilder.cpp index c5d18d3286a..8c5e178fe28 100644 --- a/clang/lib/CodeGen/ModuleBuilder.cpp +++ b/clang/lib/CodeGen/ModuleBuilder.cpp @@ -94,9 +94,11 @@ 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) - Builder->EmitTopLevelDecl(MD); + // Emit any deferred inline method definitions. Note that more deferred + // methods may be added during this loop, since ASTConsumer callbacks + // can be invoked if AST inspection results in declarations being added. + for (unsigned I = 0; I != DeferredInlineMethodDefinitions.size(); ++I) + Builder->EmitTopLevelDecl(DeferredInlineMethodDefinitions[I]); DeferredInlineMethodDefinitions.clear(); return true; |
