This patch fix problem with empty classes generation in MS mode.
- Dmitry.
Index: lib/AST/RecordLayoutBuilder.cpp
===================================================================
--- lib/AST/RecordLayoutBuilder.cpp (revision 145006)
+++ lib/AST/RecordLayoutBuilder.cpp (working copy)
@@ -1399,10 +1399,8 @@
}
// Finally, round the size of the total struct up to the alignment
- // of the struct itself. Amazingly, this does not occur in the MS
- // ABI after virtual base layout.
- if (!isMicrosoftCXXABI() || RD->getNumVBases())
- FinishLayout(RD);
+ // of the struct itself.
+ FinishLayout(RD);
#ifndef NDEBUG
// Check that we have base offsets for all bases.
@@ -1882,6 +1880,13 @@
else
setSize(CharUnits::One());
}
+
+ // MSVC doesn't round up to alignment class with virtual bases.
+ if (const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(D)) {
+ if (isMicrosoftCXXABI() && RD->getNumVBases())
+ return;
+ }
+
// Finally, round the size of the record up to the alignment of the
// record itself.
uint64_t UnpaddedSize = getSizeInBits() - UnfilledBitsInLastByte;
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
