commit 0e7bf40027f75c0c62fb002af7eab0882de6d332
author Chad Rosier <mcrosier@apple.com> Thu Aug 04 19:25:14 2011 +0000
committer Chad Rosier <mcrosier@apple.com> Thu Aug 04 19:25:14 2011 +0000
tree 1f3cb272c02c0b415567850161ac4997e5025c70
parent ca109e5665db544321106592aa6b80d20c3fdbe1

Fix style and remove obviously redundant code.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136907 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/ASTContext.cpp

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index c8ba1f1..5df4d84 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -3950,7 +3950,6 @@
   S += charUnitsToString(ParmOffset);
   // Block pointer and offset.
   S += "@?0";
-  ParmOffset = PtrSize;
   
   // Argument types.
   ParmOffset = PtrSize;

lib/AST/RecordLayoutBuilder.cpp

diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp
index 4096ba1..02b3965 100644
--- a/lib/AST/RecordLayoutBuilder.cpp
+++ b/lib/AST/RecordLayoutBuilder.cpp
@@ -1581,8 +1581,7 @@
         CharUnits ZeroLengthBitfieldAlignment = FieldInfo.second;        
         if (ZeroLengthBitfieldAlignment > FieldAlign)
           FieldAlign = ZeroLengthBitfieldAlignment;
-      }
-      else if (ZeroLengthBitfieldBoundary > FieldAlign) {
+      } else if (ZeroLengthBitfieldBoundary > FieldAlign) {
         // Align 'bar' based on a fixed alignment specified by the target.
         assert(Context.Target.useZeroLengthBitfieldAlignment() &&
                "ZeroLengthBitfieldBoundary should only be used in conjunction"