1 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index b62cc2546fb..5aeeaa41436 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -3332,11 +3332,15 @@ void CGDebugInfo::finalize() {
     Ty.replaceAllUsesWith(CGM.getLLVMContext(), RepTy);
   }
 
-  for (auto E : ObjCInterfaceCache)
+  // Creating types might create further types - invalidating the current
+  // element and the size(), so don't cache/reference them.
+  for (size_t i = 0; i != ObjCInterfaceCache.size(); ++i) {
+    ObjCInterfaceCacheEntry E = ObjCInterfaceCache[i];
     E.Decl.replaceAllUsesWith(CGM.getLLVMContext(),
                               E.Type->getDecl()->getDefinition()
                                   ? CreateTypeDefinition(E.Type, E.Unit)
                                   : E.Decl);
+  }
 
   // We keep our own list of retained types, because we need to look
   // up the final type in the type cache.