commit c2fccf83387b90be6eda9431c9606194d155406f
author Richard Smith <richard-llvm@metafoo.co.uk> Mon May 07 06:43:31 2018 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon May 07 06:43:31 2018 +0000
tree 7ffa08ef450dbf71d829fef92b2c4f4d18fccffd
parent b5a317fbf67a711f5cebad6b5c21324be103fa6c

Remove now-unnecessary check for non-zero nvsize in addition to
emptyness in MS record layout.

llvm-svn: 331621

clang/lib/AST/RecordLayoutBuilder.cpp

diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
index 47e696a..33c7fcdb 100644
--- a/clang/lib/AST/RecordLayoutBuilder.cpp
+++ b/clang/lib/AST/RecordLayoutBuilder.cpp
@@ -2617,8 +2617,8 @@
   }
 
   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.