r206090 - [MS-ABI] Fix warning introduced in r206087

Warren Hunt whunt at google.com
Fri Apr 11 17:20:50 PDT 2014


Author: whunt
Date: Fri Apr 11 19:20:50 2014
New Revision: 206090

URL: http://llvm.org/viewvc/llvm-project?rev=206090&view=rev
Log:
[MS-ABI] Fix warning introduced in r206087
No functional change.

Modified:
    cfe/trunk/lib/AST/RecordLayoutBuilder.cpp

Modified: cfe/trunk/lib/AST/RecordLayoutBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/RecordLayoutBuilder.cpp?rev=206090&r1=206089&r2=206090&view=diff
==============================================================================
--- cfe/trunk/lib/AST/RecordLayoutBuilder.cpp (original)
+++ cfe/trunk/lib/AST/RecordLayoutBuilder.cpp Fri Apr 11 19:20:50 2014
@@ -2619,8 +2619,8 @@ void MicrosoftRecordLayoutBuilder::layou
     // 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);





More information about the cfe-commits mailing list