-
Notifications
You must be signed in to change notification settings - Fork 808
[mlir] Remove duplicated SingleBlockImplicitTerminator member functions #11136
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Upstream PR: llvm/llvm-project#65959 |
Fixes #11078 |
Please look into the |
a3930aa
to
9cc3532
Compare
Just review 9cc35320c1388dea2d7c42560bf0e67bee03d9e6 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As I told @victor-eds offline, I'm not convinced that std::enable_if_t<!hasSingleBlockImplicitTerminator<OpT>
is the right approach here, because it uses the unrelated class SingleBlockImplicitTerminator
in the implementation of SingleBlock
.
9cc3532
to
f8c9c1e
Compare
…herited" trait in ODS instead of C++"" This reverts commit ecfd878. Signed-off-by: Victor Perez <[email protected]>
Change `SingleBlock::{insert,push_back}` to avoid inserting the argument operation after the block's terminator. This allows removing `SingleBlockImplicitTerminator`'s functions with the same name. Define `Block::hasTerminator` checking whether the block has a terminator operation. Signed-off-by: Victor Perez <[email protected]>
f8c9c1e
to
67830fe
Compare
DO NOT SQUASH AND MERGE THIS PR.
Avoid member functions duplication caused by SingleBlockImplicitTerminator now implying SingleBlock (since 0ac21e6). Use
std::enable_if
to provide different definitions topush_back
andinsert
.