diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2018-05-07 06:43:31 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2018-05-07 06:43:31 +0000 |
| commit | c2fccf83387b90be6eda9431c9606194d155406f (patch) | |
| tree | 7ffa08ef450dbf71d829fef92b2c4f4d18fccffd /clang | |
| parent | b5a317fbf67a711f5cebad6b5c21324be103fa6c (diff) | |
| download | bcm5719-llvm-c2fccf83387b90be6eda9431c9606194d155406f.tar.gz bcm5719-llvm-c2fccf83387b90be6eda9431c9606194d155406f.zip | |
Remove now-unnecessary check for non-zero nvsize in addition to
emptyness in MS record layout.
llvm-svn: 331621
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/AST/RecordLayoutBuilder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp index 47e696a5dc7..33c7fcdb169 100644 --- a/clang/lib/AST/RecordLayoutBuilder.cpp +++ b/clang/lib/AST/RecordLayoutBuilder.cpp @@ -2617,8 +2617,8 @@ void MicrosoftRecordLayoutBuilder::layoutNonVirtualBase( } 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. |
