maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Replace remaining usages of "Op::operator->" with "." and remove it. 

PiperOrigin-RevId: 240210336
This commit is contained in:
River Riddle 2019-03-25 13:49:45 -07:00 committed by jpienaar
parent 96ebde9cfd
commit 5f3b914a6e
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mlir/include/mlir/IR/OpDefinition.h
View File

@ -726,10 +726,6 @@ public:
/// Return the operation that this refers to.
Instruction *getInstruction() { return OpState::getInstruction(); }
// FIXME: Remove this, this is just a transition to allow using -> and staging
// patches.
ConcreteType *operator->() { return static_cast<ConcreteType *>(this); }
/// Return true if this "op class" can match against the specified operation.
/// This hook can be overridden with a more specific implementation in
/// the subclass of Base.

12
mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp
View File

@ -238,13 +238,13 @@ bool ModuleTranslation::convertInstruction(Instruction &inst,
// Emit branches. We need to look up the remapped blocks and ignore the block
// arguments that were transformed into PHI nodes.
if (auto op = inst.dyn_cast<LLVM::BrOp>()) {
builder.CreateBr(blockMapping[op->getSuccessor(0)]);
builder.CreateBr(blockMapping[op.getSuccessor(0)]);
return false;
}
if (auto op = inst.dyn_cast<LLVM::CondBrOp>()) {
builder.CreateCondBr(valueMapping.lookup(op->getOperand(0)),
blockMapping[op->getSuccessor(0)],
blockMapping[op->getSuccessor(1)]);
builder.CreateCondBr(valueMapping.lookup(op.getOperand(0)),
blockMapping[op.getSuccessor(0)],
blockMapping[op.getSuccessor(1)]);
return false;
}
@ -306,11 +306,11 @@ static Value *getPHISourceValue(Block *current, Block *pred,
assert(condBranchOp &&
"only branch instructions can be terminators of a block that "
"has successors");
assert((condBranchOp->getSuccessor(0) != condBranchOp->getSuccessor(1)) &&
assert((condBranchOp.getSuccessor(0) != condBranchOp.getSuccessor(1)) &&
"successors with arguments in LLVM conditional branches must be "
"different blocks");
return condBranchOp->getSuccessor(0) == current
return condBranchOp.getSuccessor(0) == current
? terminator.getSuccessorOperand(0, index)
: terminator.getSuccessorOperand(1, index);
}