Some minor changes toward support of data
member access in the presense of non-virtual bases.
llvm-svn: 77246
diff --git a/clang/lib/CodeGen/TargetABIInfo.cpp b/clang/lib/CodeGen/TargetABIInfo.cpp
index 5c8d5dd..76d7571 100644
--- a/clang/lib/CodeGen/TargetABIInfo.cpp
+++ b/clang/lib/CodeGen/TargetABIInfo.cpp
@@ -723,6 +723,10 @@
// Reset Lo class, this will be recomputed.
Current = NoClass;
unsigned idx = 0;
+ // FIXME. This will probably change when virtual bases are supported.
+ if (const CXXRecordDecl *CXXRD = dyn_cast<CXXRecordDecl>(RD))
+ idx += CXXRD->getNumBases();
+
for (RecordDecl::field_iterator i = RD->field_begin(), e = RD->field_end();
i != e; ++i, ++idx) {
uint64_t Offset = OffsetBase + Layout.getFieldOffset(idx);