[mlir] Mark `isa/dyn_cast/cast/...` member functions deprecated. #90413

chsigg · 2024-04-28T20:10:00Z

This also removes the member overload in TypeSwitch.

All other users have been removed in fac349a and bd9fdce.

llvmbot · 2024-04-28T20:10:31Z

@llvm/pr-subscribers-flang-codegen
@llvm/pr-subscribers-flang-fir-hlfir
@llvm/pr-subscribers-mlir-core

@llvm/pr-subscribers-mlir

Author: Christian Sigg (chsigg)

Changes

All users have been removed in fac349a.

Except for TypeSwitch, where the deprecation warning needs to be disabled until the functions are removed.

Full diff: https://github.com/llvm/llvm-project/pull/90413.diff

4 Files Affected:

(modified) llvm/include/llvm/ADT/TypeSwitch.h (+3)
(modified) mlir/include/mlir/IR/Attributes.h (+5)
(modified) mlir/include/mlir/IR/Location.h (+3)
(modified) mlir/include/mlir/IR/Types.h (+5)

diff --git a/llvm/include/llvm/ADT/TypeSwitch.h b/llvm/include/llvm/ADT/TypeSwitch.h
index 10a2d48e918db9..14ad56ad575ffc 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

llvmbot · 2024-04-28T20:10:32Z

@llvm/pr-subscribers-llvm-adt

Author: Christian Sigg (chsigg)

Changes

All users have been removed in fac349a.

Except for TypeSwitch, where the deprecation warning needs to be disabled until the functions are removed.

Full diff: https://github.com/llvm/llvm-project/pull/90413.diff

4 Files Affected:

(modified) llvm/include/llvm/ADT/TypeSwitch.h (+3)
(modified) mlir/include/mlir/IR/Attributes.h (+5)
(modified) mlir/include/mlir/IR/Location.h (+3)
(modified) mlir/include/mlir/IR/Types.h (+5)

diff --git a/llvm/include/llvm/ADT/TypeSwitch.h b/llvm/include/llvm/ADT/TypeSwitch.h
index 10a2d48e918db9..14ad56ad575ffc 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

chsigg · 2024-04-28T20:12:27Z

Note that this change previously broke a Windows build.

@dyung, could you please advise how to test this change so I don't break it again?

dyung · 2024-04-29T03:56:17Z

Note that this change previously broke a Windows build.

@dyung, could you please advise how to test this change so I don't break it again?

I don't know if this change is any different from what you submitted, but when I applied the patches locally, our Windows build failed the same way as before.

All users have been removed in fac349a and bd9fdce. Except for TypeSwitch, where the deprecation warning needs to be disabled until the functions are removed.

Remove member cast overload in TypeSwitch so we don't have to disable the warning.

chsigg · 2024-04-30T08:32:43Z

This passes the Windows CI now which uses the same Visual Studio 2019 version as the CI build that previously broke. This is expected because it no longer uses the LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH macro. I did see cl.exe running out of heap space on previous revisions building flang, but that is likely an unrelated transient failure.

chsigg · 2024-04-30T09:25:38Z

The Windows build that caused problems previously is still passing after this change.

DanielCChen · 2024-04-30T14:46:17Z

It seems this PR causes build failure on LoP (Linux On Power) as

llvm-project/flang/lib/Optimizer/Transforms/AddDebugInfo.cpp:148:26: error: 'dyn_cast' is deprecated: Use mlir::dyn_cast<U>() instead [-Werror,-Wdeprecated-declarations]
    if (auto funcLoc = l.dyn_cast<mlir::FileLineColLoc>())
                         ^

There are also quite a lot warning on top of the failures. @chsigg

Fix compiler warning caused by using deprecated interface (#90413)

chsigg · 2024-05-02T10:31:20Z

It seems this PR causes build failure on LoP (Linux On Power) as
llvm-project/flang/lib/Optimizer/Transforms/AddDebugInfo.cpp:148:26: error: 'dyn_cast' is deprecated: Use mlir::dyn_cast<U>() instead [-Werror,-Wdeprecated-declarations]
    if (auto funcLoc = l.dyn_cast<mlir::FileLineColLoc>())
                         ^
There are also quite a lot warning on top of the failures. @chsigg

Sorry about that, not sure how I missed these. Hopefully they are now fixed with 52cb953?

Thank you very much kazutakahirata and PeimingLiu for jumping in!

DanielCChen · 2024-05-02T14:02:19Z

It seems this PR causes build failure on LoP (Linux On Power) as
llvm-project/flang/lib/Optimizer/Transforms/AddDebugInfo.cpp:148:26: error: 'dyn_cast' is deprecated: Use mlir::dyn_cast<U>() instead [-Werror,-Wdeprecated-declarations]
    if (auto funcLoc = l.dyn_cast<mlir::FileLineColLoc>())
                         ^
There are also quite a lot warning on top of the failures. @chsigg
Sorry about that, not sure how I missed these. Hopefully they are now fixed with 52cb953?

Thank you very much kazutakahirata and PeimingLiu for jumping in!

Yes. All the errors and warnings are fixed. Thanks!

llvmbot added mlir:core MLIR Core Infrastructure mlir llvm:adt labels Apr 28, 2024

chsigg mentioned this pull request Apr 28, 2024

Revert "[mlir] Mark isa/dyn_cast/cast/... member functions deprecated. (#89998)" #90250

Merged

llvmbot added flang Flang issues not falling into any other category flang:fir-hlfir flang:codegen labels Apr 28, 2024

chsigg mentioned this pull request Apr 29, 2024

[flang] Use isa/dyn_cast/cast/... free functions. #90432

Merged

chsigg force-pushed the deprecate_cast branch from d74c891 to 12f0332 Compare April 29, 2024 07:19

chsigg added 2 commits April 29, 2024 16:29

[mlir] Mark isa/dyn_cast/cast/... member functions deprecated.

26c4c60

All users have been removed in fac349a and bd9fdce. Except for TypeSwitch, where the deprecation warning needs to be disabled until the functions are removed.

Also deprecate mlir::pdll::ast::Type cast members.

0bca049

Remove member cast overload in TypeSwitch so we don't have to disable the warning.

chsigg force-pushed the deprecate_cast branch from f1ece7d to 0bca049 Compare April 29, 2024 14:29

chsigg merged commit 7ac1fb0 into llvm:main Apr 30, 2024
4 checks passed

chsigg deleted the deprecate_cast branch April 30, 2024 08:34

chsigg mentioned this pull request Apr 30, 2024

Remove calls to isa/dyn_cast/cast/... member functions. #90453

Closed

DavidSpickett mentioned this pull request Apr 30, 2024

Reapply "[flang] Improve debug info for functions." with regression fixed. #90484

Merged

PeimingLiu mentioned this pull request Apr 30, 2024

[mlir][NFC] update code to use mlir::dyn_cast/cast/isa #90633

Merged

PeimingLiu pushed a commit that referenced this pull request Apr 30, 2024

[mlir][NFC] update code to use mlir::dyn_cast/cast/isa (#90633)

d235369

Fix compiler warning caused by using deprecated interface (#90413)

aartbik mentioned this pull request May 3, 2024

[torch-mlir] Bump LLVM to llvm/llvm-project@fc83eda4 llvm/torch-mlir#3282

Closed

jopperm mentioned this pull request Jun 24, 2024

Replace uses of isa/dyn_cast/cast/... member functions llvm/clangir#702

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[mlir] Mark `isa/dyn_cast/cast/...` member functions deprecated. #90413

[mlir] Mark `isa/dyn_cast/cast/...` member functions deprecated. #90413

chsigg commented Apr 28, 2024 •

edited

Loading

llvmbot commented Apr 28, 2024 •

edited

Loading

llvmbot commented Apr 28, 2024

chsigg commented Apr 28, 2024

dyung commented Apr 29, 2024

chsigg commented Apr 30, 2024

chsigg commented Apr 30, 2024 •

edited

Loading

DanielCChen commented Apr 30, 2024 •

edited

Loading

chsigg commented May 2, 2024

DanielCChen commented May 2, 2024

[mlir] Mark isa/dyn_cast/cast/... member functions deprecated. #90413

[mlir] Mark isa/dyn_cast/cast/... member functions deprecated. #90413

Conversation

chsigg commented Apr 28, 2024 • edited Loading

llvmbot commented Apr 28, 2024 • edited Loading

llvmbot commented Apr 28, 2024

chsigg commented Apr 28, 2024

dyung commented Apr 29, 2024

chsigg commented Apr 30, 2024

chsigg commented Apr 30, 2024 • edited Loading

DanielCChen commented Apr 30, 2024 • edited Loading

chsigg commented May 2, 2024

DanielCChen commented May 2, 2024

[mlir] Mark `isa/dyn_cast/cast/...` member functions deprecated. #90413

[mlir] Mark `isa/dyn_cast/cast/...` member functions deprecated. #90413

chsigg commented Apr 28, 2024 •

edited

Loading

llvmbot commented Apr 28, 2024 •

edited

Loading

chsigg commented Apr 30, 2024 •

edited

Loading

DanielCChen commented Apr 30, 2024 •

edited

Loading