[cfe-commits] r136907 - in /cfe/trunk/lib/AST: ASTContext.cpp RecordLayoutBuilder.cpp

[Chad Rosier]

Author: mcrosier
Date: Thu Aug  4 14:25:14 2011
New Revision: 136907

URL: http://llvm.org/viewvc/llvm-project?rev=136907&view=rev
Log:
Fix style and remove obviously redundant code.

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

Modified: cfe/trunk/lib/AST/ASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTContext.cpp?rev=136907&r1=136906&r2=136907&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ASTContext.cpp (original)
+++ cfe/trunk/lib/AST/ASTContext.cpp Thu Aug  4 14:25:14 2011
@@ -3950,7 +3950,6 @@
   S += charUnitsToString(ParmOffset);
   // Block pointer and offset.
   S += "@?0";
-  ParmOffset = PtrSize;
   
   // Argument types.
   ParmOffset = PtrSize;

Modified: cfe/trunk/lib/AST/RecordLayoutBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/RecordLayoutBuilder.cpp?rev=136907&r1=136906&r2=136907&view=diff
==============================================================================
--- cfe/trunk/lib/AST/RecordLayoutBuilder.cpp (original)
+++ cfe/trunk/lib/AST/RecordLayoutBuilder.cpp Thu Aug  4 14:25:14 2011
@@ -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"