dont call iterator::end() on every cycle and dont read already-deleted memory

llvm-svn: 61015

1 files changed, 4 insertions, 3 deletions

diff --git a/clang/lib/AST/DeclarationName.cpp b/clang/lib/AST/DeclarationName.cpp
index 9535965ecf7..044acd71d48 100644
--- a/clang/lib/AST/DeclarationName.cpp
+++ b/clang/lib/AST/DeclarationName.cpp
@@ -261,10 +261,11 @@ DeclarationNameTable::DeclarationNameTable() {
 DeclarationNameTable::~DeclarationNameTable() {
   llvm::FoldingSet<CXXSpecialName> *set =
     static_cast<llvm::FoldingSet<CXXSpecialName>*>(CXXSpecialNamesImpl);
-  llvm::FoldingSetIterator<CXXSpecialName> it = set->begin();
+  llvm::FoldingSetIterator<CXXSpecialName> I = set->begin(), E = set->end();
 
-  while (it != set->end()) {
-    delete &*it++;
+  while (I != E) {
+    CXXSpecialName *n = &*I++;
+    delete n;
   }
 
   delete set;