From aa80aa1f92bfaadd1736a309efe11e48f77fd6f4 Mon Sep 17 00:00:00 2001
From: Warren Hunt <whunt@google.com>
Date: Sat, 12 Apr 2014 00:20:50 +0000
Subject: [PATCH] [MS-ABI] Fix warning introduced in r206087 No functional
change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@206090 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/AST/RecordLayoutBuilder.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp
index fda374e9a08..ef818bb4ade 100644
--- a/lib/AST/RecordLayoutBuilder.cpp
+++ b/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);
--
GitLab