commit 81c0b5c2006590ee983807b609369e761fa74b5e
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Sep 26 18:14:24 2011 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Sep 26 18:14:24 2011 +0000
tree 3321b83ed0df8e0aa3e102e453a4336952ebcdd5
parent 7aa043afd909dd118576affb8660d283de942611

Fix assertion hit when @encoding C++ classes. rdar://10172840 & http://llvm.org/PR10990

llvm-svn: 140542

clang/lib/AST/ASTContext.cpp

diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 4d3d88a..fa0ebc8 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -4583,8 +4583,9 @@
       if (base->isEmpty())
         continue;
       uint64_t offs = layout.getVBaseClassOffsetInBits(base);
-      FieldOrBaseOffsets.insert(FieldOrBaseOffsets.upper_bound(offs),
-                                std::make_pair(offs, base));
+      if (FieldOrBaseOffsets.find(offs) == FieldOrBaseOffsets.end())
+        FieldOrBaseOffsets.insert(FieldOrBaseOffsets.end(),
+                                  std::make_pair(offs, base));
     }
   }