Author: rsmith Date: Sun May 6 23:43:31 2018 New Revision: 331621 URL: http://llvm.org/viewvc/llvm-project?rev=331621&view=rev Log: Remove now-unnecessary check for non-zero nvsize in addition to emptyness in MS record layout.
Modified: cfe/trunk/lib/AST/RecordLayoutBuilder.cpp Modified: cfe/trunk/lib/AST/RecordLayoutBuilder.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/RecordLayoutBuilder.cpp?rev=331621&r1=331620&r2=331621&view=diff ============================================================================== --- cfe/trunk/lib/AST/RecordLayoutBuilder.cpp (original) +++ cfe/trunk/lib/AST/RecordLayoutBuilder.cpp Sun May 6 23:43:31 2018 @@ -2617,8 +2617,8 @@ void MicrosoftRecordLayoutBuilder::layou } if (!FoundBase) { - if (MDCUsesEBO && BaseDecl->isEmpty() && - BaseLayout.getNonVirtualSize() == CharUnits::Zero()) { + if (MDCUsesEBO && BaseDecl->isEmpty()) { + assert(BaseLayout.getNonVirtualSize() == CharUnits::Zero()); BaseOffset = CharUnits::Zero(); } else { // Otherwise, lay the base out at the end of the MDC. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits