commit 0908c333cc251540dfcf17ac4a9b07ea6da27aaf
author Daniel Dunbar <daniel@zuster.org> Sat Aug 01 23:40:20 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Sat Aug 01 23:40:20 2009 +0000
tree 7a63b3fa22d0dde41bd4333f5fa1b38f7043bf21
parent 5242e8200d605266cdb4de64609a4b5772be35f7

Avoid accessing invalid std::vector element; this makes clang
ENABLE_EXPENSIVE_CHECKS clean on x86_64-.*-darwin10.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77831 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/DeclCXX.cpp

diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index cc481be..4a2f799 100644
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -348,8 +348,9 @@
     return 0;
   
   OverriddenMethodsMapTy::iterator it = OverriddenMethods->find(this);
-  if (it == OverriddenMethods->end())
+  if (it == OverriddenMethods->end() || it->second->empty())
     return 0;
+
   return &(*it->second)[0];
 }
 
@@ -358,7 +359,7 @@
     return 0;
   
   OverriddenMethodsMapTy::iterator it = OverriddenMethods->find(this);
-  if (it == OverriddenMethods->end())
+  if (it == OverriddenMethods->end() || it->second->empty())
     return 0;
 
   return &(*it->second)[it->second->size()];