Skip to content

Commit 697e94c

Browse files
ggreifggreif
committed
Fix a bunch of 80col violations that arose from the Create API change. Tweak makefile targets to find these better.
llvm-svn: 51143
1 parent 06166e8 commit 697e94c

23 files changed

+134
-78
lines changed

‎llvm/Makefile.rules

+9-2
Original file line numberDiff line numberDiff line change
@@ -1738,10 +1738,17 @@ endif
17381738
endif
17391739

17401740
check-line-length:
1741-
@egrep -n '.{81}' $(Sources)
1741+
@echo searching for overlength lines in files: $(Sources)
1742+
@echo
1743+
@echo
1744+
@egrep -n '.{81}' $(Sources) /dev/null
17421745

17431746
check-for-tabs:
1744-
@egrep -n ' ' $(Sources)
1747+
@echo searching for tabs in files: $(Sources)
1748+
@echo
1749+
@echo
1750+
@egrep -n ' ' $(Sources) /dev/null
1751+
17451752
check-footprint:
17461753
@ls -l $(LibDir) | awk '\
17471754
BEGIN { sum = 0; } \

‎llvm/examples/BrainF/BrainF.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,10 @@ void BrainF::readloop(PHINode *phi, BasicBlock *oldbb, BasicBlock *testbb) {
278278
BasicBlock *bb_1 = BasicBlock::Create(label, brainf_func);
279279
builder->SetInsertPoint(bb_1);
280280

281-
//Make part of PHI instruction now, wait until end of loop to finish
282-
PHINode *phi_0 = PHINode::Create(PointerType::getUnqual(IntegerType::Int8Ty),
283-
headreg, testbb);
281+
// Make part of PHI instruction now, wait until end of loop to finish
282+
PHINode *phi_0 =
283+
PHINode::Create(PointerType::getUnqual(IntegerType::Int8Ty),
284+
headreg, testbb);
284285
phi_0->reserveOperandSpace(2);
285286
phi_0->addIncoming(curhead, bb_0);
286287
curhead = phi_0;

‎llvm/lib/AsmParser/llvmAsmParser.y

+2-1
Original file line numberDiff line numberDiff line change
@@ -2712,7 +2712,8 @@ BBTerminatorInst :
27122712
PAL = PAListPtr::get(Attrs.begin(), Attrs.end());
27132713

27142714
// Create the InvokeInst
2715-
InvokeInst *II = InvokeInst::Create(V, Normal, Except, Args.begin(),Args.end());
2715+
InvokeInst *II = InvokeInst::Create(V, Normal, Except,
2716+
Args.begin(), Args.end());
27162717
II->setCallingConv($2);
27172718
II->setParamAttrs(PAL);
27182719
$$ = II;

‎llvm/lib/Bitcode/Reader/BitcodeReader.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,8 @@ bool BitcodeReader::ParseFunctionBody(Function *F) {
14851485
}
14861486
}
14871487

1488-
I = InvokeInst::Create(Callee, NormalBB, UnwindBB, Ops.begin(), Ops.end());
1488+
I = InvokeInst::Create(Callee, NormalBB, UnwindBB,
1489+
Ops.begin(), Ops.end());
14891490
cast<InvokeInst>(I)->setCallingConv(CCInfo);
14901491
cast<InvokeInst>(I)->setParamAttrs(PAL);
14911492
break;

‎llvm/lib/ExecutionEngine/JIT/JIT.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,13 @@ GenericValue JIT::runFunction(Function *F,
265265
Args.push_back(C);
266266
}
267267

268-
CallInst *TheCall = CallInst::Create(F, Args.begin(), Args.end(), "", StubBB);
268+
CallInst *TheCall = CallInst::Create(F, Args.begin(), Args.end(),
269+
"", StubBB);
269270
TheCall->setTailCall();
270271
if (TheCall->getType() != Type::VoidTy)
271-
ReturnInst::Create(TheCall, StubBB); // Return result of the call.
272+
ReturnInst::Create(TheCall, StubBB); // Return result of the call.
272273
else
273-
ReturnInst::Create(StubBB); // Just return void.
274+
ReturnInst::Create(StubBB); // Just return void.
274275

275276
// Finally, return the value returned by our nullary stub function.
276277
return runFunction(Stub, std::vector<GenericValue>());

‎llvm/lib/Linker/LinkModules.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,8 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
855855
// We have a definition of the same name but different type in the
856856
// source module. Copy the prototype to the destination and replace
857857
// uses of the destination's prototype with the new prototype.
858-
Function *NewDF = Function::Create(SF->getFunctionType(), SF->getLinkage(),
858+
Function *NewDF = Function::Create(SF->getFunctionType(),
859+
SF->getLinkage(),
859860
SF->getName(), Dest);
860861
CopyGVAttributes(NewDF, SF);
861862

@@ -891,7 +892,8 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
891892
} else if (!DF || SF->hasInternalLinkage() || DF->hasInternalLinkage()) {
892893
// Function does not already exist, simply insert an function signature
893894
// identical to SF into the dest module.
894-
Function *NewDF = Function::Create(SF->getFunctionType(), SF->getLinkage(),
895+
Function *NewDF = Function::Create(SF->getFunctionType(),
896+
SF->getLinkage(),
895897
SF->getName(), Dest);
896898
CopyGVAttributes(NewDF, SF);
897899

‎llvm/lib/Transforms/IPO/GlobalOpt.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,8 @@ static void RewriteHeapSROALoadUser(LoadInst *Load, Instruction *LoadUser,
10821082
GEPIdx.push_back(GEPI->getOperand(1));
10831083
GEPIdx.append(GEPI->op_begin()+3, GEPI->op_end());
10841084

1085-
Value *NGEPI = GetElementPtrInst::Create(NewPtr, GEPIdx.begin(), GEPIdx.end(),
1085+
Value *NGEPI = GetElementPtrInst::Create(NewPtr,
1086+
GEPIdx.begin(), GEPIdx.end(),
10861087
GEPI->getName(), GEPI);
10871088
GEPI->replaceAllUsesWith(NGEPI);
10881089
GEPI->eraseFromParent();

‎llvm/lib/Transforms/Instrumentation/RSProfiling.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,8 @@ Value* ProfilerRS::Translate(Value* v) {
381381
if (bb == &bb->getParent()->getEntryBlock())
382382
TransCache[bb] = bb; //don't translate entry block
383383
else
384-
TransCache[bb] = BasicBlock::Create("dup_" + bb->getName(), bb->getParent(),
385-
NULL);
384+
TransCache[bb] = BasicBlock::Create("dup_" + bb->getName(),
385+
bb->getParent(), NULL);
386386
return TransCache[bb];
387387
} else if (Instruction* i = dyn_cast<Instruction>(v)) {
388388
//we have already translated this

‎llvm/lib/Transforms/Scalar/GVNPRE.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -909,12 +909,13 @@ Value* GVNPRE::phi_translate(Value* V, BasicBlock* pred, BasicBlock* succ) {
909909
Instruction* newVal = 0;
910910
if (ShuffleVectorInst* S = dyn_cast<ShuffleVectorInst>(U))
911911
newVal = new ShuffleVectorInst(newOp1, newOp2, newOp3,
912-
S->getName()+".expr");
912+
S->getName() + ".expr");
913913
else if (InsertElementInst* I = dyn_cast<InsertElementInst>(U))
914914
newVal = InsertElementInst::Create(newOp1, newOp2, newOp3,
915-
I->getName()+".expr");
915+
I->getName() + ".expr");
916916
else if (SelectInst* I = dyn_cast<SelectInst>(U))
917-
newVal = SelectInst::Create(newOp1, newOp2, newOp3, I->getName()+".expr");
917+
newVal = SelectInst::Create(newOp1, newOp2, newOp3,
918+
I->getName() + ".expr");
918919

919920
uint32_t v = VN.lookup_or_add(newVal);
920921

‎llvm/lib/Transforms/Scalar/InstructionCombining.cpp

+16-9
Original file line numberDiff line numberDiff line change
@@ -8348,7 +8348,8 @@ Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
83488348
if (AddOp != TI)
83498349
std::swap(NewTrueOp, NewFalseOp);
83508350
Instruction *NewSel =
8351-
SelectInst::Create(CondVal, NewTrueOp,NewFalseOp,SI.getName()+".p");
8351+
SelectInst::Create(CondVal, NewTrueOp,
8352+
NewFalseOp, SI.getName() + ".p");
83528353

83538354
NewSel = InsertNewInstBefore(NewSel, SI);
83548355
return BinaryOperator::createAdd(SubOp->getOperand(0), NewSel);
@@ -8374,7 +8375,8 @@ Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
83748375
if (OpToFold) {
83758376
Constant *C = GetSelectFoldableConstant(TVI);
83768377
Instruction *NewSel =
8377-
SelectInst::Create(SI.getCondition(), TVI->getOperand(2-OpToFold), C);
8378+
SelectInst::Create(SI.getCondition(),
8379+
TVI->getOperand(2-OpToFold), C);
83788380
InsertNewInstBefore(NewSel, SI);
83798381
NewSel->takeName(TVI);
83808382
if (BinaryOperator *BO = dyn_cast<BinaryOperator>(TVI))
@@ -8399,7 +8401,8 @@ Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
83998401
if (OpToFold) {
84008402
Constant *C = GetSelectFoldableConstant(FVI);
84018403
Instruction *NewSel =
8402-
SelectInst::Create(SI.getCondition(), C, FVI->getOperand(2-OpToFold));
8404+
SelectInst::Create(SI.getCondition(), C,
8405+
FVI->getOperand(2-OpToFold));
84038406
InsertNewInstBefore(NewSel, SI);
84048407
NewSel->takeName(FVI);
84058408
if (BinaryOperator *BO = dyn_cast<BinaryOperator>(FVI))
@@ -8757,7 +8760,8 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) {
87578760
}
87588761

87598762
// Insert this value into the result vector.
8760-
Result = InsertElementInst::Create(Result, ExtractedElts[Idx], i, "tmp");
8763+
Result = InsertElementInst::Create(Result, ExtractedElts[Idx],
8764+
i, "tmp");
87618765
InsertNewInstBefore(cast<Instruction>(Result), CI);
87628766
}
87638767
return CastInst::create(Instruction::BitCast, Result, CI.getType());
@@ -9090,7 +9094,8 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) {
90909094
Instruction *NC;
90919095
if (InvokeInst *II = dyn_cast<InvokeInst>(Caller)) {
90929096
NC = InvokeInst::Create(Callee, II->getNormalDest(), II->getUnwindDest(),
9093-
Args.begin(), Args.end(), Caller->getName(), Caller);
9097+
Args.begin(), Args.end(),
9098+
Caller->getName(), Caller);
90949099
cast<InvokeInst>(NC)->setCallingConv(II->getCallingConv());
90959100
cast<InvokeInst>(NC)->setParamAttrs(NewCallerPAL);
90969101
} else {
@@ -9331,15 +9336,17 @@ Instruction *InstCombiner::FoldPHIArgBinOpIntoPHI(PHINode &PN) {
93319336
Value *InRHS = FirstInst->getOperand(1);
93329337
PHINode *NewLHS = 0, *NewRHS = 0;
93339338
if (LHSVal == 0) {
9334-
NewLHS = PHINode::Create(LHSType, FirstInst->getOperand(0)->getName()+".pn");
9339+
NewLHS = PHINode::Create(LHSType,
9340+
FirstInst->getOperand(0)->getName() + ".pn");
93359341
NewLHS->reserveOperandSpace(PN.getNumOperands()/2);
93369342
NewLHS->addIncoming(InLHS, PN.getIncomingBlock(0));
93379343
InsertNewInstBefore(NewLHS, PN);
93389344
LHSVal = NewLHS;
93399345
}
93409346

93419347
if (RHSVal == 0) {
9342-
NewRHS = PHINode::Create(RHSType, FirstInst->getOperand(1)->getName()+".pn");
9348+
NewRHS = PHINode::Create(RHSType,
9349+
FirstInst->getOperand(1)->getName() + ".pn");
93439350
NewRHS->reserveOperandSpace(PN.getNumOperands()/2);
93449351
NewRHS->addIncoming(InRHS, PN.getIncomingBlock(0));
93459352
InsertNewInstBefore(NewRHS, PN);
@@ -10864,8 +10871,8 @@ Instruction *InstCombiner::visitExtractElementInst(ExtractElementInst &EI) {
1086410871
cast<PointerType>(I->getOperand(0)->getType())->getAddressSpace();
1086510872
Value *Ptr = InsertBitCastBefore(I->getOperand(0),
1086610873
PointerType::get(EI.getType(), AS),EI);
10867-
GetElementPtrInst *GEP =
10868-
GetElementPtrInst::Create(Ptr, EI.getOperand(1), I->getName() + ".gep");
10874+
GetElementPtrInst *GEP =
10875+
GetElementPtrInst::Create(Ptr, EI.getOperand(1), I->getName()+".gep");
1086910876
InsertNewInstBefore(GEP, EI);
1087010877
return new LoadInst(GEP);
1087110878
}

‎llvm/lib/Transforms/Scalar/LoopRotation.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,8 @@ void LoopRotate::preserveCanonicalLoopForm(LPPassManager &LPM) {
471471
// Right now original pre-header has two successors, new header and
472472
// exit block. Insert new block between original pre-header and
473473
// new header such that loop's new pre-header has only one successor.
474-
BasicBlock *NewPreHeader = BasicBlock::Create("bb.nph", OrigHeader->getParent(),
474+
BasicBlock *NewPreHeader = BasicBlock::Create("bb.nph",
475+
OrigHeader->getParent(),
475476
NewHeader);
476477
LoopInfo &LI = LPM.getAnalysis<LoopInfo>();
477478
if (Loop *PL = LI.getLoopFor(OrigPreHeader))

‎llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,8 @@ bool TailCallElim::ProcessReturningBlock(ReturnInst *Ret, BasicBlock *&OldEntry,
401401
Instruction *InsertPos = OldEntry->begin();
402402
for (Function::arg_iterator I = F->arg_begin(), E = F->arg_end();
403403
I != E; ++I) {
404-
PHINode *PN = PHINode::Create(I->getType(), I->getName()+".tr", InsertPos);
404+
PHINode *PN = PHINode::Create(I->getType(),
405+
I->getName() + ".tr", InsertPos);
405406
I->replaceAllUsesWith(PN); // Everyone use the PHI node now!
406407
PN->addIncoming(I, NewEntry);
407408
ArgumentPHIs.push_back(PN);

‎llvm/lib/Transforms/Utils/CodeExtractor.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,8 @@ ExtractCodeRegion(const std::vector<BasicBlock*> &code) {
641641
Function *oldFunction = header->getParent();
642642

643643
// This takes place of the original loop
644-
BasicBlock *codeReplacer = BasicBlock::Create("codeRepl", oldFunction, header);
644+
BasicBlock *codeReplacer = BasicBlock::Create("codeRepl", oldFunction,
645+
header);
645646

646647
// The new function needs a root node because other nodes can branch to the
647648
// head of the region, but the entry node of a function cannot have preds.

‎llvm/lib/Transforms/Utils/InlineFunction.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,8 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) {
532532
GR->eraseFromParent();
533533
}
534534
} else {
535-
PHINode *PHI = PHINode::Create(RTy, TheCall->getName(), AfterCallBB->begin());
535+
PHINode *PHI = PHINode::Create(RTy, TheCall->getName(),
536+
AfterCallBB->begin());
536537
PHIs.push_back(PHI);
537538
// Anything that used the result of the function call should now use the
538539
// PHI node as their operand.

‎llvm/lib/Transforms/Utils/LCSSA.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ Value *LCSSA::GetValueForBlock(DomTreeNode *BB, Instruction *OrigInst,
281281

282282
// Otherwise, the idom is the loop, so we need to insert a PHI node. Do so
283283
// now, then get values to fill in the incoming values for the PHI.
284-
PHINode *PN = PHINode::Create(OrigInst->getType(), OrigInst->getName()+".lcssa",
285-
BBN->begin());
284+
PHINode *PN = PHINode::Create(OrigInst->getType(),
285+
OrigInst->getName() + ".lcssa", BBN->begin());
286286
PN->reserveOperandSpace(std::distance(pred_begin(BBN), pred_end(BBN)));
287287
V = PN;
288288

‎llvm/lib/Transforms/Utils/SimplifyCFG.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,8 @@ static bool FoldValueComparisonIntoPredecessors(TerminatorInst *TI) {
802802
AddPredecessorToBlock(NewSuccessors[i], Pred, BB);
803803

804804
// Now that the successors are updated, create the new Switch instruction.
805-
SwitchInst *NewSI = SwitchInst::Create(CV, PredDefault, PredCases.size(), PTI);
805+
SwitchInst *NewSI = SwitchInst::Create(CV, PredDefault,
806+
PredCases.size(), PTI);
806807
for (unsigned i = 0, e = PredCases.size(); i != e; ++i)
807808
NewSI->addCase(PredCases[i].first, PredCases[i].second);
808809

@@ -1919,7 +1920,8 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
19191920
if (!TrueWhenEqual) std::swap(DefaultBB, EdgeBB);
19201921

19211922
// Create the new switch instruction now.
1922-
SwitchInst *New = SwitchInst::Create(CompVal, DefaultBB,Values.size(),BI);
1923+
SwitchInst *New = SwitchInst::Create(CompVal, DefaultBB,
1924+
Values.size(), BI);
19231925

19241926
// Add all of the 'cases' to the switch instruction.
19251927
for (unsigned i = 0, e = Values.size(); i != e; ++i)

‎llvm/lib/VMCore/Constants.cpp

+7-4
Original file line numberDiff line numberDiff line change
@@ -539,9 +539,11 @@ class VISIBILITY_HIDDEN GetElementPtrConstantExpr : public ConstantExpr {
539539
GetElementPtrConstantExpr(Constant *C, const std::vector<Constant*> &IdxList,
540540
const Type *DestTy);
541541
public:
542-
static GetElementPtrConstantExpr *Create(Constant *C, const std::vector<Constant*> &IdxList,
542+
static GetElementPtrConstantExpr *Create(Constant *C,
543+
const std::vector<Constant*>&IdxList,
543544
const Type *DestTy) {
544-
return new(IdxList.size() + 1) GetElementPtrConstantExpr(C, IdxList, DestTy);
545+
return new(IdxList.size() + 1)
546+
GetElementPtrConstantExpr(C, IdxList, DestTy);
545547
}
546548
/// Transparently provide more efficient getOperand methods.
547549
DECLARE_TRANSPARENT_OPERAND_ACCESSORS(Value);
@@ -1973,8 +1975,9 @@ Constant *ConstantExpr::getSelectTy(const Type *ReqTy, Constant *C,
19731975
Constant *ConstantExpr::getGetElementPtrTy(const Type *ReqTy, Constant *C,
19741976
Value* const *Idxs,
19751977
unsigned NumIdx) {
1976-
assert(GetElementPtrInst::getIndexedType(C->getType(), Idxs, Idxs+NumIdx, true) &&
1977-
"GEP indices invalid!");
1978+
assert(GetElementPtrInst::getIndexedType(C->getType(),
1979+
Idxs, Idxs+NumIdx, true)
1980+
&& "GEP indices invalid!");
19781981

19791982
if (Constant *FC = ConstantFoldGetElementPtr(C, (Constant**)Idxs, NumIdx))
19801983
return FC; // Fold a few common cases...

‎llvm/lib/VMCore/Function.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ bool Argument::hasNoAliasAttr() const {
106106
/// it in its containing function.
107107
bool Argument::hasStructRetAttr() const {
108108
if (!isa<PointerType>(getType())) return false;
109-
if (this != getParent()->arg_begin()) return false; // StructRet param must be first param
109+
if (this != getParent()->arg_begin())
110+
return false; // StructRet param must be first param
110111
return getParent()->paramHasAttr(1, ParamAttr::StructRet);
111112
}
112113

0 commit comments

Comments
 (0)