replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[TableGen] Remove unnecessary outer 'if' and merge it's conditions into the inner 'if's. NFC 

llvm-svn: 239206
This commit is contained in:
Craig Topper 2015-06-06 01:33:55 +00:00
parent 25a849ca02
commit daf263de84
1 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
llvm/lib/TableGen/Record.cpp
View File

@ -913,8 +913,6 @@ static Init *EvaluateOperation(OpInit *RHSo, Init *LHS, Init *Arg,
static Init *ForeachHelper(Init *LHS, Init *MHS, Init *RHS, RecTy *Type, static Init *ForeachHelper(Init *LHS, Init *MHS, Init *RHS, RecTy *Type,
Record *CurRec, MultiClass *CurMultiClass) { Record *CurRec, MultiClass *CurMultiClass) {
DagInit *MHSd = dyn_cast<DagInit>(MHS);
ListInit *MHSl = dyn_cast<ListInit>(MHS);
OpInit *RHSo = dyn_cast<OpInit>(RHS); OpInit *RHSo = dyn_cast<OpInit>(RHS);
@ -926,53 +924,54 @@ static Init *ForeachHelper(Init *LHS, Init *MHS, Init *RHS, RecTy *Type,
if (!LHSt) if (!LHSt)
PrintFatalError(CurRec->getLoc(), "!foreach requires typed variable\n"); PrintFatalError(CurRec->getLoc(), "!foreach requires typed variable\n");
if ((MHSd && isa<DagRecTy>(Type)) || (MHSl && isa<ListRecTy>(Type))) { DagInit *MHSd = dyn_cast<DagInit>(MHS);
if (MHSd) { if (MHSd && isa<DagRecTy>(Type)) {
Init *Val = MHSd->getOperator(); Init *Val = MHSd->getOperator();
Init *Result = EvaluateOperation(RHSo, LHS, Val, Init *Result = EvaluateOperation(RHSo, LHS, Val,
Type, CurRec, CurMultiClass); Type, CurRec, CurMultiClass);
if (Result)
Val = Result;
std::vector<std::pair<Init *, std::string> > args;
for (unsigned int i = 0; i < MHSd->getNumArgs(); ++i) {
Init *Arg = MHSd->getArg(i);
std::string ArgName = MHSd->getArgName(i);
// Process args
Init *Result = EvaluateOperation(RHSo, LHS, Arg, Type,
CurRec, CurMultiClass);
if (Result) if (Result)
Val = Result; Arg = Result;
std::vector<std::pair<Init *, std::string> > args; // TODO: Process arg names
for (unsigned int i = 0; i < MHSd->getNumArgs(); ++i) { args.push_back(std::make_pair(Arg, ArgName));
Init *Arg = MHSd->getArg(i); }
std::string ArgName = MHSd->getArgName(i);
// Process args return DagInit::get(Val, "", args);
Init *Result = EvaluateOperation(RHSo, LHS, Arg, Type, }
CurRec, CurMultiClass);
if (Result)
Arg = Result;
// TODO: Process arg names ListInit *MHSl = dyn_cast<ListInit>(MHS);
args.push_back(std::make_pair(Arg, ArgName)); if (MHSl && isa<ListRecTy>(Type)) {
std::vector<Init *> NewOperands;
std::vector<Init *> NewList(MHSl->begin(), MHSl->end());
for (Init *&Item : NewList) {
NewOperands.clear();
for(int i = 0; i < RHSo->getNumOperands(); ++i) {
// First, replace the foreach variable with the list item
if (LHS->getAsString() == RHSo->getOperand(i)->getAsString())
NewOperands.push_back(Item);
else
NewOperands.push_back(RHSo->getOperand(i));
} }
return DagInit::get(Val, "", args); // Now run the operator and use its result as the new list item
} const OpInit *NewOp = RHSo->clone(NewOperands);
if (MHSl) { Init *NewItem = NewOp->Fold(CurRec, CurMultiClass);
std::vector<Init *> NewOperands; if (NewItem != NewOp)
std::vector<Init *> NewList(MHSl->begin(), MHSl->end()); Item = NewItem;
for (Init *&Item : NewList) {
NewOperands.clear();
for(int i = 0; i < RHSo->getNumOperands(); ++i) {
// First, replace the foreach variable with the list item
if (LHS->getAsString() == RHSo->getOperand(i)->getAsString())
NewOperands.push_back(Item);
else
NewOperands.push_back(RHSo->getOperand(i));
}
// Now run the operator and use its result as the new list item
const OpInit *NewOp = RHSo->clone(NewOperands);
Init *NewItem = NewOp->Fold(CurRec, CurMultiClass);
if (NewItem != NewOp)
Item = NewItem;
}
return ListInit::get(NewList, MHSl->getType());
} }
return ListInit::get(NewList, MHSl->getType());
} }
return nullptr; return nullptr;
} }