[Mlir-commits] [llvm] [mlir] [mlir] Mark `isa/dyn_cast/cast/...` member functions deprecated. (PR #90413)
Christian Sigg
llvmlistbot at llvm.org
Mon Apr 29 02:02:36 PDT 2024
https://github.com/chsigg updated https://github.com/llvm/llvm-project/pull/90413
>From 12f03326606bc49948f1942cdfaaa44c8538a846 Mon Sep 17 00:00:00 2001
From: Christian Sigg <csigg at google.com>
Date: Sun, 28 Apr 2024 22:03:26 +0200
Subject: [PATCH 1/2] [mlir] Mark `isa/dyn_cast/cast/...` member functions
deprecated.
All users have been removed in fac349a169976f822fb27f03e623fa0d28aec1f3 and bd9fdce69b4c4cdb572e715c5f453aaf9b77b83a.
Except for TypeSwitch, where the deprecation warning needs to be disabled until the functions are removed.
---
llvm/include/llvm/ADT/TypeSwitch.h | 3 +++
mlir/include/mlir/IR/Attributes.h | 5 +++++
mlir/include/mlir/IR/Location.h | 3 +++
mlir/include/mlir/IR/Types.h | 5 +++++
4 files changed, 16 insertions(+)
diff --git a/llvm/include/llvm/ADT/TypeSwitch.h b/llvm/include/llvm/ADT/TypeSwitch.h
index 10a2d48e918db9..c79775bc8ad4c3 100644
--- a/llvm/include/llvm/ADT/TypeSwitch.h
+++ b/llvm/include/llvm/ADT/TypeSwitch.h
@@ -74,7 +74,10 @@ template <typename DerivedT, typename T> class TypeSwitchBase {
ValueT &&value,
std::enable_if_t<is_detected<has_dyn_cast_t, ValueT, CastT>::value> * =
nullptr) {
+ // Silence warnings about MLIR's deprecated dyn_cast member functions.
+ LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH;
return value.template dyn_cast<CastT>();
+ LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_POP;
}
/// Attempt to dyn_cast the given `value` to `CastT`. This overload is
diff --git a/mlir/include/mlir/IR/Attributes.h b/mlir/include/mlir/IR/Attributes.h
index cc0cee6a31183c..8a077865b51b5f 100644
--- a/mlir/include/mlir/IR/Attributes.h
+++ b/mlir/include/mlir/IR/Attributes.h
@@ -50,14 +50,19 @@ class Attribute {
/// Casting utility functions. These are deprecated and will be removed,
/// please prefer using the `llvm` namespace variants instead.
template <typename... Tys>
+ [[deprecated("Use mlir::isa<U>() instead")]]
bool isa() const;
template <typename... Tys>
+ [[deprecated("Use mlir::isa_and_nonnull<U>() instead")]]
bool isa_and_nonnull() const;
template <typename U>
+ [[deprecated("Use mlir::dyn_cast<U>() instead")]]
U dyn_cast() const;
template <typename U>
+ [[deprecated("Use mlir::dyn_cast_or_null<U>() instead")]]
U dyn_cast_or_null() const;
template <typename U>
+ [[deprecated("Use mlir::cast<U>() instead")]]
U cast() const;
/// Return a unique identifier for the concrete attribute type. This is used
diff --git a/mlir/include/mlir/IR/Location.h b/mlir/include/mlir/IR/Location.h
index aa8314f38cdfac..423b4d19b5b944 100644
--- a/mlir/include/mlir/IR/Location.h
+++ b/mlir/include/mlir/IR/Location.h
@@ -78,14 +78,17 @@ class Location {
/// Type casting utilities on the underlying location.
template <typename U>
+ [[deprecated("Use mlir::isa<U>() instead")]]
bool isa() const {
return llvm::isa<U>(*this);
}
template <typename U>
+ [[deprecated("Use mlir::dyn_cast<U>() instead")]]
U dyn_cast() const {
return llvm::dyn_cast<U>(*this);
}
template <typename U>
+ [[deprecated("Use mlir::cast<U>() instead")]]
U cast() const {
return llvm::cast<U>(*this);
}
diff --git a/mlir/include/mlir/IR/Types.h b/mlir/include/mlir/IR/Types.h
index a89e13b625bf40..65824531fdc908 100644
--- a/mlir/include/mlir/IR/Types.h
+++ b/mlir/include/mlir/IR/Types.h
@@ -97,14 +97,19 @@ class Type {
bool operator!() const { return impl == nullptr; }
template <typename... Tys>
+ [[deprecated("Use mlir::isa<U>() instead")]]
bool isa() const;
template <typename... Tys>
+ [[deprecated("Use mlir::isa_and_nonnull<U>() instead")]]
bool isa_and_nonnull() const;
template <typename U>
+ [[deprecated("Use mlir::dyn_cast<U>() instead")]]
U dyn_cast() const;
template <typename U>
+ [[deprecated("Use mlir::dyn_cast_or_null<U>() instead")]]
U dyn_cast_or_null() const;
template <typename U>
+ [[deprecated("Use mlir::cast<U>() instead")]]
U cast() const;
/// Return a unique identifier for the concrete type. This is used to support
>From f1ece7d48e1929856eed528795909dc93b0bcfb7 Mon Sep 17 00:00:00 2001
From: Christian Sigg <csigg at google.com>
Date: Mon, 29 Apr 2024 11:01:10 +0200
Subject: [PATCH 2/2] Also deprecate mlir::pdll::ast::Type cast members.
Remove member cast overload in TypeSwitch so we don't have to disable the warning.
---
llvm/include/llvm/ADT/TypeSwitch.h | 27 ++---------------------
mlir/include/mlir/Tools/PDLL/AST/Types.h | 28 ++++++++++++++++++++++++
2 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/llvm/include/llvm/ADT/TypeSwitch.h b/llvm/include/llvm/ADT/TypeSwitch.h
index c79775bc8ad4c3..5bbbdf23b257ed 100644
--- a/llvm/include/llvm/ADT/TypeSwitch.h
+++ b/llvm/include/llvm/ADT/TypeSwitch.h
@@ -61,32 +61,9 @@ template <typename DerivedT, typename T> class TypeSwitchBase {
}
protected:
- /// Trait to check whether `ValueT` provides a 'dyn_cast' method with type
- /// `CastT`.
- template <typename ValueT, typename CastT>
- using has_dyn_cast_t =
- decltype(std::declval<ValueT &>().template dyn_cast<CastT>());
-
- /// Attempt to dyn_cast the given `value` to `CastT`. This overload is
- /// selected if `value` already has a suitable dyn_cast method.
+ /// Attempt to dyn_cast the given `value` to `CastT`.
template <typename CastT, typename ValueT>
- static decltype(auto) castValue(
- ValueT &&value,
- std::enable_if_t<is_detected<has_dyn_cast_t, ValueT, CastT>::value> * =
- nullptr) {
- // Silence warnings about MLIR's deprecated dyn_cast member functions.
- LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH;
- return value.template dyn_cast<CastT>();
- LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_POP;
- }
-
- /// Attempt to dyn_cast the given `value` to `CastT`. This overload is
- /// selected if llvm::dyn_cast should be used.
- template <typename CastT, typename ValueT>
- static decltype(auto) castValue(
- ValueT &&value,
- std::enable_if_t<!is_detected<has_dyn_cast_t, ValueT, CastT>::value> * =
- nullptr) {
+ static decltype(auto) castValue(ValueT &&value) {
return dyn_cast<CastT>(value);
}
diff --git a/mlir/include/mlir/Tools/PDLL/AST/Types.h b/mlir/include/mlir/Tools/PDLL/AST/Types.h
index 03252e9f6620c8..89c8e193ddc32b 100644
--- a/mlir/include/mlir/Tools/PDLL/AST/Types.h
+++ b/mlir/include/mlir/Tools/PDLL/AST/Types.h
@@ -64,23 +64,28 @@ class Type {
/// Provide type casting support.
template <typename U>
+ [[deprecated("Use mlir::isa<U>() instead")]]
bool isa() const {
assert(impl && "isa<> used on a null type.");
return U::classof(*this);
}
template <typename U, typename V, typename... Others>
+ [[deprecated("Use mlir::isa<U>() instead")]]
bool isa() const {
return isa<U>() || isa<V, Others...>();
}
template <typename U>
+ [[deprecated("Use mlir::dyn_cast<U>() instead")]]
U dyn_cast() const {
return isa<U>() ? U(impl) : U(nullptr);
}
template <typename U>
+ [[deprecated("Use mlir::dyn_cast_or_null<U>() instead")]]
U dyn_cast_or_null() const {
return (impl && isa<U>()) ? U(impl) : U(nullptr);
}
template <typename U>
+ [[deprecated("Use mlir::cast<U>() instead")]]
U cast() const {
assert(isa<U>());
return U(impl);
@@ -323,6 +328,29 @@ struct DenseMapInfo<mlir::pdll::ast::Type> {
return lhs == rhs;
}
};
+
+/// Add support for llvm style casts.
+/// We provide a cast between To and From if From is mlir::pdll::ast::Type or
+/// derives from it
+template <typename To, typename From>
+struct CastInfo<
+ To, From,
+ std::enable_if_t<
+ std::is_same_v<mlir::pdll::ast::Type, std::remove_const_t<From>> ||
+ std::is_base_of_v<mlir::pdll::ast::Type, From>>>
+ : NullableValueCastFailed<To>,
+ DefaultDoCastIfPossible<To, From, CastInfo<To, From>> {
+ static inline bool isPossible(mlir::pdll::ast::Type ty) {
+ /// Return a constant true instead of a dynamic true when casting to self or
+ /// up the hierarchy.
+ if constexpr (std::is_base_of_v<To, From>) {
+ return true;
+ } else {
+ return To::classof(ty);
+ };
+ }
+ static inline To doCast(mlir::pdll::ast::Type ty) { return To(ty.getImpl()); }
+};
} // namespace llvm
#endif // MLIR_TOOLS_PDLL_AST_TYPES_H_
More information about the Mlir-commits
mailing list