diff options
| -rw-r--r-- | lib/AST/DeclarationName.cpp | 2 | ||||
| -rw-r--r-- | lib/AST/Expr.cpp | 20 | ||||
| -rw-r--r-- | lib/AST/TranslationUnit.cpp | 2 |
3 files changed, 14 insertions, 10 deletions
diff --git a/lib/AST/DeclarationName.cpp b/lib/AST/DeclarationName.cpp index 0a6adef15b..c1077c189b 100644 --- a/lib/AST/DeclarationName.cpp +++ b/lib/AST/DeclarationName.cpp @@ -302,7 +302,7 @@ DeclarationNameTable::getCXXSpecialName(DeclarationName::NameKind Kind, switch (Kind) { case DeclarationName::CXXConstructorName: EKind = DeclarationNameExtra::CXXConstructor; - assert(Ty.getCVRQualifiers() == 0 && "Constructor type must be unqualified"); + assert(Ty.getCVRQualifiers() == 0 &&"Constructor type must be unqualified"); break; case DeclarationName::CXXDestructorName: EKind = DeclarationNameExtra::CXXDestructor; diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp index 9e0d0cd954..8d10c1fa7f 100644 --- a/lib/AST/Expr.cpp +++ b/lib/AST/Expr.cpp @@ -109,7 +109,7 @@ CallExpr::CallExpr(ASTContext& C, StmtClass SC, Expr *fn, Expr **args, unsigned numargs, QualType t, SourceLocation rparenloc) : Expr(SC, t, fn->isTypeDependent() || hasAnyTypeDependentArguments(args, numargs), - fn->isValueDependent() || hasAnyValueDependentArguments(args, numargs)), + fn->isValueDependent() || hasAnyValueDependentArguments(args,numargs)), NumArgs(numargs) { SubExprs = new (C) Stmt*[numargs+1]; @@ -124,7 +124,7 @@ CallExpr::CallExpr(ASTContext& C, Expr *fn, Expr **args, unsigned numargs, QualType t, SourceLocation rparenloc) : Expr(CallExprClass, t, fn->isTypeDependent() || hasAnyTypeDependentArguments(args, numargs), - fn->isValueDependent() || hasAnyValueDependentArguments(args, numargs)), + fn->isValueDependent() || hasAnyValueDependentArguments(args,numargs)), NumArgs(numargs) { SubExprs = new (C) Stmt*[numargs+1]; @@ -245,7 +245,8 @@ InitListExpr::InitListExpr(SourceLocation lbraceloc, } void InitListExpr::resizeInits(ASTContext &Context, unsigned NumInits) { - for (unsigned Idx = NumInits, LastIdx = InitExprs.size(); Idx < LastIdx; ++Idx) + for (unsigned Idx = NumInits, LastIdx = InitExprs.size(); + Idx != LastIdx; ++Idx) delete InitExprs[Idx]; InitExprs.resize(NumInits, 0); } @@ -1030,7 +1031,7 @@ bool Expr::isIntegerConstantExpr(llvm::APSInt &Result, ASTContext &Ctx, // Initialize result to have correct signedness and width. Result = llvm::APSInt(static_cast<uint32_t>(Ctx.getTypeSize(getType())), - !getType()->isSignedIntegerType()); + !getType()->isSignedIntegerType()); // The LHS of a constant expr is always evaluated and needed. if (!Exp->getLHS()->isIntegerConstantExpr(LHS, Ctx, Loc, isEvaluated)) @@ -1549,18 +1550,21 @@ DesignatedInitExpr::Create(ASTContext &C, Designator *Designators, SourceRange DesignatedInitExpr::getSourceRange() const { SourceLocation StartLoc; - Designator &First = *const_cast<DesignatedInitExpr*>(this)->designators_begin(); + Designator &First = + *const_cast<DesignatedInitExpr*>(this)->designators_begin(); if (First.isFieldDesignator()) { if (UsesColonSyntax) StartLoc = SourceLocation::getFromRawEncoding(First.Field.FieldLoc); else StartLoc = SourceLocation::getFromRawEncoding(First.Field.DotLoc); } else - StartLoc = SourceLocation::getFromRawEncoding(First.ArrayOrRange.LBracketLoc); + StartLoc = + SourceLocation::getFromRawEncoding(First.ArrayOrRange.LBracketLoc); return SourceRange(StartLoc, getInit()->getSourceRange().getEnd()); } -DesignatedInitExpr::designators_iterator DesignatedInitExpr::designators_begin() { +DesignatedInitExpr::designators_iterator +DesignatedInitExpr::designators_begin() { char* Ptr = static_cast<char*>(static_cast<void *>(this)); Ptr += sizeof(DesignatedInitExpr); return static_cast<Designator*>(static_cast<void*>(Ptr)); @@ -1645,7 +1649,7 @@ Stmt::child_iterator IntegerLiteral::child_begin() { return child_iterator(); } Stmt::child_iterator IntegerLiteral::child_end() { return child_iterator(); } // CharacterLiteral -Stmt::child_iterator CharacterLiteral::child_begin() { return child_iterator(); } +Stmt::child_iterator CharacterLiteral::child_begin() { return child_iterator();} Stmt::child_iterator CharacterLiteral::child_end() { return child_iterator(); } // FloatingLiteral diff --git a/lib/AST/TranslationUnit.cpp b/lib/AST/TranslationUnit.cpp index 9e01167248..95cad39f68 100644 --- a/lib/AST/TranslationUnit.cpp +++ b/lib/AST/TranslationUnit.cpp @@ -231,7 +231,7 @@ TranslationUnit* TranslationUnit::Create(llvm::Deserializer& Dezr, // For Selectors, we must read the identifier table first because the // SelectorTable depends on the identifiers being already deserialized. - llvm::Deserializer::Location SelectorBlkLoc = Dezr.getCurrentBlockLocation(); + llvm::Deserializer::Location SelectorBlkLoc = Dezr.getCurrentBlockLocation(); Dezr.SkipBlock(); // Read the identifier table. |