commit 4f7efb7a8fc3590d641d6ee1cd6e88286af79b37
author Warren Hunt <whunt@google.com> Sat Apr 12 00:20:50 2014 +0000
committer Warren Hunt <whunt@google.com> Sat Apr 12 00:20:50 2014 +0000
tree afeef85ec7da9b6f495081d761e6c8caeaab9544
parent 4ec124bc3e46def49ee1e714c02cbb7797e0a073

[MS-ABI] Fix warning introduced in r206087
No functional change.

llvm-svn: 206090

clang/lib/AST/RecordLayoutBuilder.cpp

diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
index fda374e..ef818bb 100644
--- a/clang/lib/AST/RecordLayoutBuilder.cpp
+++ b/clang/lib/AST/RecordLayoutBuilder.cpp
@@ -2619,8 +2619,8 @@
     // 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);