commit cad86653942d4e33c2674ea40e77d7fe59990130
author Fariborz Jahanian <fjahanian@apple.com> Mon Jul 27 20:57:45 2009 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Mon Jul 27 20:57:45 2009 +0000
tree 3219329c642de4e5379dec12c3af4af806d4409f
parent 3c38aab8bbcb8dbc80081616e74f64b9a47edd25

Some minor changes toward support of data
member access in the presense of non-virtual bases.


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

lib/CodeGen/CGRecordLayoutBuilder.cpp

diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp
index 546c544..ed08d34 100644
--- a/lib/CodeGen/CGRecordLayoutBuilder.cpp
+++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp
@@ -199,6 +199,10 @@
   const ASTRecordLayout &Layout = Types.getContext().getASTRecordLayout(D);
   
   unsigned FieldNo = 0;
+  // FIXME. This will probably change when virtual bases are supported.
+  if (const CXXRecordDecl *CXXRD = dyn_cast<CXXRecordDecl>(D))
+    FieldNo += CXXRD->getNumBases();
+
   for (RecordDecl::field_iterator Field = D->field_begin(), 
        FieldEnd = D->field_end(); Field != FieldEnd; ++Field, ++FieldNo) {
     if (!LayoutField(*Field, Layout.getFieldOffset(FieldNo))) {