[mlir][StorageUniquer] Restore old signature for default implementaion of verifyInvariants. #103023
Conversation
|
@matthias-springer btw, thank you for leaving notes on your PR for integrators---much appreciated! |
|
@llvm/pr-subscribers-mlir Author: Benjamin Chetioui (bchetioui) ChangesPR #102326 changed the prototype of the default implementation of verify to include emitErrorFn. This breaks automatic derivation in consumer attributes, such as https://github.com/tensorflow/runtime/blob/60277ba976739502e45ad26585e071568fa44af1/include/tfrt/core_runtime/opdefs/attributes.h#L53. This PR simply restores the signature to what it was prior to PR #102326. Full diff: https://github.com/llvm/llvm-project/pull/103023.diff 1 Files Affected:
diff --git a/mlir/include/mlir/IR/StorageUniquerSupport.h b/mlir/include/mlir/IR/StorageUniquerSupport.h
index d6ccbbd8579947..c493fd9c5042c7 100644
--- a/mlir/include/mlir/IR/StorageUniquerSupport.h
+++ b/mlir/include/mlir/IR/StorageUniquerSupport.h
@@ -227,8 +227,7 @@ class StorageUserBase : public BaseT, public Traits<ConcreteT>... {
/// Default implementation that just returns success.
template <typename... Args>
static LogicalResult
- verifyInvariants(function_ref<InFlightDiagnostic()> emitErrorFn,
- Args... args) {
+ verifyInvariants(Args... args) {
return success();
}
|
|
@llvm/pr-subscribers-mlir-core Author: Benjamin Chetioui (bchetioui) ChangesPR #102326 changed the prototype of the default implementation of verify to include emitErrorFn. This breaks automatic derivation in consumer attributes, such as https://github.com/tensorflow/runtime/blob/60277ba976739502e45ad26585e071568fa44af1/include/tfrt/core_runtime/opdefs/attributes.h#L53. This PR simply restores the signature to what it was prior to PR #102326. Full diff: https://github.com/llvm/llvm-project/pull/103023.diff 1 Files Affected:
diff --git a/mlir/include/mlir/IR/StorageUniquerSupport.h b/mlir/include/mlir/IR/StorageUniquerSupport.h
index d6ccbbd8579947..c493fd9c5042c7 100644
--- a/mlir/include/mlir/IR/StorageUniquerSupport.h
+++ b/mlir/include/mlir/IR/StorageUniquerSupport.h
@@ -227,8 +227,7 @@ class StorageUserBase : public BaseT, public Traits<ConcreteT>... {
/// Default implementation that just returns success.
template <typename... Args>
static LogicalResult
- verifyInvariants(function_ref<InFlightDiagnostic()> emitErrorFn,
- Args... args) {
+ verifyInvariants(Args... args) {
return success();
}
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
bchetioui
force-pushed
the
fix-verify-invariants
branch
from
fa733c2 to
f491fe0
Compare
|
Isn't this function always called with a |
|
Nope, it seems like this is also called with a |
…on of verifyInvariants. PR llvm#102326 changed the prototype of the default implementation of verify to include emitErrorFn. This breaks automatic derivation in consumer attributes, such as https://github.com/tensorflow/runtime/blob/60277ba976739502e45ad26585e071568fa44af1/include/tfrt/core_runtime/opdefs/attributes.h#L53. This PR simply restores the signature to what it was prior to PR llvm#102326.
bchetioui
force-pushed
the
fix-verify-invariants
branch
from
f491fe0 to
7f76489
Compare
|
Thanks for the review, @matthias-springer! |
PR #102326 changed the prototype of the default implementation of verify to include emitErrorFn.
This breaks automatic derivation in consumer attributes, such as https://github.com/tensorflow/runtime/blob/60277ba976739502e45ad26585e071568fa44af1/include/tfrt/core_runtime/opdefs/attributes.h#L53.
This PR simply restores the signature to what it was prior to PR #102326.