diff options
| -rw-r--r-- | lib/AST/ASTContext.cpp | 1 | ||||
| -rw-r--r-- | lib/AST/RecordLayoutBuilder.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index c8ba1f1107..5df4d8405b 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -3950,7 +3950,6 @@ std::string ASTContext::getObjCEncodingForBlock(const BlockExpr *Expr) const { S += charUnitsToString(ParmOffset); // Block pointer and offset. S += "@?0"; - ParmOffset = PtrSize; // Argument types. ParmOffset = PtrSize; diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp index 4096ba1db4..02b3965f32 100644 --- a/lib/AST/RecordLayoutBuilder.cpp +++ b/lib/AST/RecordLayoutBuilder.cpp @@ -1581,8 +1581,7 @@ void RecordLayoutBuilder::LayoutField(const FieldDecl *D) { 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" |