summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Hunt <whunt@google.com>2014-04-12 00:20:50 +0000
committerWarren Hunt <whunt@google.com>2014-04-12 00:20:50 +0000
commit4f7efb7a8fc3590d641d6ee1cd6e88286af79b37 (patch)
treeafeef85ec7da9b6f495081d761e6c8caeaab9544
parent4ec124bc3e46def49ee1e714c02cbb7797e0a073 (diff)
downloadbcm5719-llvm-4f7efb7a8fc3590d641d6ee1cd6e88286af79b37.tar.gz
bcm5719-llvm-4f7efb7a8fc3590d641d6ee1cd6e88286af79b37.zip
[MS-ABI] Fix warning introduced in r206087
No functional change. llvm-svn: 206090
-rw-r--r--clang/lib/AST/RecordLayoutBuilder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
index fda374e9a08..ef818bb4ade 100644
--- a/clang/lib/AST/RecordLayoutBuilder.cpp
+++ b/clang/lib/AST/RecordLayoutBuilder.cpp
@@ -2619,8 +2619,8 @@ void MicrosoftRecordLayoutBuilder::layoutVirtualBases(const CXXRecordDecl *RD) {
// with a zero sized base. The padding between virtual bases is 4
// bytes (in both 32 and 64 bits modes) and always involves rounding up to
// the required alignment, we don't know why.
- if (PreviousBaseLayout && PreviousBaseLayout->hasZeroSizedSubObject() &&
- BaseLayout.leadsWithZeroSizedBase() || HasVtordisp)
+ if ((PreviousBaseLayout && PreviousBaseLayout->hasZeroSizedSubObject() &&
+ BaseLayout.leadsWithZeroSizedBase()) || HasVtordisp)
Size = Size.RoundUpToAlignment(VtorDispAlignment) + VtorDispSize;
// Insert the virtual base.
ElementInfo Info = getAdjustedElementInfo(BaseLayout);
OpenPOWER on IntegriCloud