commit 1a973447d0524b6dbb67605c33481687b24cd862
author Eli Friedman <eli.friedman@gmail.com> Wed Sep 18 01:59:16 2013 +0000
committer Eli Friedman <eli.friedman@gmail.com> Wed Sep 18 01:59:16 2013 +0000
tree b1dd6bb6a117ac898c373e20fe1322d68a9e8162
parent 71687a01e3f634f9be26a29006380f1cf10a31ca

Fix ObjC @encode for C++ classes w/virtual bases.

PR17142.

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

lib/AST/ASTContext.cpp

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index ee71116..fd9c7cf 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -5552,7 +5552,8 @@
       if (base->isEmpty())
         continue;
       uint64_t offs = toBits(layout.getVBaseClassOffset(base));
-      if (FieldOrBaseOffsets.find(offs) == FieldOrBaseOffsets.end())
+      if (offs >= uint64_t(toBits(layout.getNonVirtualSize())) &&
+          FieldOrBaseOffsets.find(offs) == FieldOrBaseOffsets.end())
         FieldOrBaseOffsets.insert(FieldOrBaseOffsets.end(),
                                   std::make_pair(offs, base));
     }