From: Devang Patel Date: Tue, 30 Oct 2007 20:59:40 +0000 (+0000) Subject: Fix 80 col violations. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9b8c0a38549692f1b8f688c05c35442fc620865;p=clang Fix 80 col violations. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@43516 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/CodeGen/CGExpr.cpp b/CodeGen/CGExpr.cpp index 4c602488cc..a0ef03bdc8 100644 --- a/CodeGen/CGExpr.cpp +++ b/CodeGen/CGExpr.cpp @@ -230,7 +230,7 @@ void CodeGenFunction::EmitStoreThroughLValue(RValue Src, LValue Dst, Builder.CreateStore(Src.getScalarVal(), DstAddr); } -void CodeGenFunction::EmitStoreThroughOCUComponentLValue(RValue Src, LValue Dst, +void CodeGenFunction::EmitStoreThroughOCUComponentLValue(RValue Src, LValue Dst, QualType Ty) { // This access turns into a read/modify/write of the vector. Load the input // value now. @@ -392,9 +392,9 @@ LValue CodeGenFunction::EmitMemberExpr(const MemberExpr *E) { if (E->isArrow()) { QualType PTy = cast(BaseExpr->getType())->getPointeeType(); - BaseValue = Builder.CreateBitCast(BaseValue, - llvm::PointerType::get(ConvertType(PTy)), - "tmp"); + BaseValue = + Builder.CreateBitCast(BaseValue, + llvm::PointerType::get(ConvertType(PTy)), "tmp"); } } else BaseValue = EmitScalarExpr(BaseExpr); @@ -408,7 +408,8 @@ LValue CodeGenFunction::EmitMemberExpr(const MemberExpr *E) { // Match union field type. if (BaseExpr->getType()->isUnionType()) { const llvm::Type * FieldTy = ConvertType(Field->getType()); - const llvm::PointerType * BaseTy = cast(BaseValue->getType()); + const llvm::PointerType * BaseTy = + cast(BaseValue->getType()); if (FieldTy != BaseTy->getElementType()) { V = Builder.CreateBitCast(V, llvm::PointerType::get(FieldTy), "tmp"); } diff --git a/CodeGen/CGExprAgg.cpp b/CodeGen/CGExprAgg.cpp index 9e2368e1d5..160f491c5e 100644 --- a/CodeGen/CGExprAgg.cpp +++ b/CodeGen/CGExprAgg.cpp @@ -194,13 +194,15 @@ void AggExprEmitter::VisitInitListExpr(InitListExpr *E) { std::vector ArrayElts; const llvm::PointerType *APType = cast(DestPtr->getType()); - const llvm::ArrayType *AType = cast(APType->getElementType()); + const llvm::ArrayType *AType = + cast(APType->getElementType()); // Copy initializer elements. bool AllConstElements = true; unsigned i = 0; for (i = 0; i < NumInitElements; ++i) { - if (llvm::Constant *C = dyn_cast(CGF.EmitScalarExpr(E->getInit(i)))) + if (llvm::Constant *C = + dyn_cast(CGF.EmitScalarExpr(E->getInit(i)))) ArrayElts.push_back(C); else { AllConstElements = false; diff --git a/CodeGen/CGExprComplex.cpp b/CodeGen/CGExprComplex.cpp index aa66bb6dfb..085e83762a 100644 --- a/CodeGen/CGExprComplex.cpp +++ b/CodeGen/CGExprComplex.cpp @@ -303,13 +303,15 @@ ComplexPairTy ComplexExprEmitter::VisitPrePostIncDec(const UnaryOperator *E, NextVal = llvm::ConstantInt::get(InVal.first->getType(), AmountVal); else if (InVal.first->getType() == llvm::Type::FloatTy) // FIXME: Handle long double. - NextVal = llvm::ConstantFP::get(InVal.first->getType(), - llvm::APFloat(static_cast(AmountVal))); + NextVal = + llvm::ConstantFP::get(InVal.first->getType(), + llvm::APFloat(static_cast(AmountVal))); else { // FIXME: Handle long double. assert(InVal.first->getType() == llvm::Type::DoubleTy); - NextVal = llvm::ConstantFP::get(InVal.first->getType(), - llvm::APFloat(static_cast(AmountVal))); + NextVal = + llvm::ConstantFP::get(InVal.first->getType(), + llvm::APFloat(static_cast(AmountVal))); } // Add the inc/dec to the real part. diff --git a/CodeGen/CGExprScalar.cpp b/CodeGen/CGExprScalar.cpp index 277bcdea2c..dd3c2ed7f0 100644 --- a/CodeGen/CGExprScalar.cpp +++ b/CodeGen/CGExprScalar.cpp @@ -496,13 +496,15 @@ Value *ScalarExprEmitter::VisitPrePostIncDec(const UnaryOperator *E, NextVal = llvm::ConstantInt::get(InVal->getType(), AmountVal); else if (InVal->getType() == llvm::Type::FloatTy) // FIXME: Handle long double. - NextVal = llvm::ConstantFP::get(InVal->getType(), - llvm::APFloat(static_cast(AmountVal))); + NextVal = + llvm::ConstantFP::get(InVal->getType(), + llvm::APFloat(static_cast(AmountVal))); else { // FIXME: Handle long double. assert(InVal->getType() == llvm::Type::DoubleTy); - NextVal = llvm::ConstantFP::get(InVal->getType(), - llvm::APFloat(static_cast(AmountVal))); + NextVal = + llvm::ConstantFP::get(InVal->getType(), + llvm::APFloat(static_cast(AmountVal))); } NextVal = Builder.CreateAdd(InVal, NextVal, isInc ? "inc" : "dec"); } @@ -907,7 +909,8 @@ VisitConditionalOperator(const ConditionalOperator *E) { Value *ScalarExprEmitter::VisitChooseExpr(ChooseExpr *E) { // Emit the LHS or RHS as appropriate. - return Visit(E->isConditionTrue(CGF.getContext()) ? E->getLHS() : E->getRHS()); + return + Visit(E->isConditionTrue(CGF.getContext()) ? E->getLHS() : E->getRHS()); } Value *ScalarExprEmitter::VisitVAArgExpr(VAArgExpr *VE) diff --git a/CodeGen/CGStmt.cpp b/CodeGen/CGStmt.cpp index 3a55e04818..6a2e3aa543 100644 --- a/CodeGen/CGStmt.cpp +++ b/CodeGen/CGStmt.cpp @@ -469,8 +469,8 @@ void CodeGenFunction::EmitSwitchStmt(const SwitchStmt &S) { llvm::BasicBlock *NextBlock = new llvm::BasicBlock("after.sw", CurFn); SwitchInsn = Builder.CreateSwitch(CondV, NextBlock); - // All break statements jump to NextBlock. If BreakContinueStack is non empty then - // reuse last ContinueBlock. + // All break statements jump to NextBlock. If BreakContinueStack is non empty + // then reuse last ContinueBlock. llvm::BasicBlock *ContinueBlock = NULL; if (!BreakContinueStack.empty()) ContinueBlock = BreakContinueStack.back().ContinueBlock; diff --git a/CodeGen/CodeGenModule.cpp b/CodeGen/CodeGenModule.cpp index 00c262167c..b5f4c8d1ff 100644 --- a/CodeGen/CodeGenModule.cpp +++ b/CodeGen/CodeGenModule.cpp @@ -83,15 +83,18 @@ void CodeGenModule::EmitGlobalVar(const FileVarDecl *D) { std::vector ArrayElts; const llvm::PointerType *APType = cast(GV->getType()); - const llvm::ArrayType *AType = cast(APType->getElementType()); + const llvm::ArrayType *AType = + cast(APType->getElementType()); // Copy initializer elements. unsigned i = 0; for (i = 0; i < NumInitElements; ++i) { assert (ILE->getInit(i)->getType()->isIntegerType() && "Only IntegerType global array initializers are supported"); - llvm::APSInt Value(static_cast( - getContext().getTypeSize(ILE->getInit(i)->getType(), SourceLocation()))); + llvm::APSInt + Value(static_cast + (getContext().getTypeSize(ILE->getInit(i)->getType(), + SourceLocation()))); if (ILE->getInit(i)->isIntegerConstantExpr(Value, Context)) { llvm::Constant *C = llvm::ConstantInt::get(Value); ArrayElts.push_back(C); @@ -100,8 +103,9 @@ void CodeGenModule::EmitGlobalVar(const FileVarDecl *D) { // Initialize remaining array elements. unsigned NumArrayElements = AType->getNumElements(); + const llvm::Type *AElemTy = AType->getElementType(); for (; i < NumArrayElements; ++i) - ArrayElts.push_back(llvm::Constant::getNullValue(AType->getElementType())); + ArrayElts.push_back(llvm::Constant::getNullValue(AElemTy)); Init = llvm::ConstantArray::get(AType, ArrayElts); } else diff --git a/CodeGen/CodeGenTypes.cpp b/CodeGen/CodeGenTypes.cpp index 1fd09e974a..106931381b 100644 --- a/CodeGen/CodeGenTypes.cpp +++ b/CodeGen/CodeGenTypes.cpp @@ -235,8 +235,9 @@ const llvm::Type *CodeGenTypes::ConvertNewType(QualType T) { return OpaqueI->second; // Create new OpaqueType now for later use. - // FIXME: This creates a lot of opaque types, most of which are not needed. - // Reevaluate this when performance analyis finds tons of opaque types. + // FIXME: This creates a lot of opaque types, most of them are not + // needed. Reevaluate this when performance analyis finds tons of + // opaque types. llvm::OpaqueType *OpaqueTy = llvm::OpaqueType::get(); RecordTypesToResolve[RD] = OpaqueTy; TypeHolderMap.insert(std::make_pair(T.getTypePtr(),