[CIR][NFC] Replace uses of isa/dyn_cast/cast/... member functions #703

jopperm · 2024-06-26T10:14:27Z

Mechanical rewrite to use the corresponding free functions; fixes #702.

I used a slightly modified version of the clang-tidy check provided in https://discourse.llvm.org/t/psa-deprecating-cast-isa-methods-in-some-classes/70909 to rewrite the C++ source files, regular expressions for the TableGen files, and manual cleanups where needed (e.g. chains like x.foo().cast<A>().bar().cast())

I applied the following heuristic to determine which namespace prefix to use:

If the target type is not qualified, and the TU has using namespace mlir or the code is inside the mlir namespace -> use a plain isa/cast/...
- Exception: Always qualify inside custom types and attributes, because their base classes define the very members we want to get rid of.
Else. i.e. the target type is qualified as ::mlir:: or mlir::, use that prefix.

The clang-tidy check also rewrote dyn_cast_or_null to dyn_cast_if_present. I think that's useful because the former variant is going to be deprecated as well in the future.

I'm using -Werror=deprecated-declarations to test the change (see 6b7420a); this required also changing two occurrences of StringRef::equals to ==. I could also just drop the commit here; maybe we want to enable -Werror in general (there aren't too many other warnings left in the codebase).

Signed-off-by: Julian Oppermann <[email protected]>

bcardosolopes

This is great, thanks a bunch! LGTM

bcardosolopes · 2024-06-26T16:18:09Z

clang/lib/CIR/CMakeLists.txt

+if (MSVC)
+  add_compile_options("/we4996")
+else()
+  add_compile_options("-Werror=deprecated-declarations")


seven-mile · 2024-06-27T10:54:33Z

Note that /we4996 may be too aggressive for MSVC.

See the discussion in this issue.

Currently HEAD won't compile with the toolchain of VS2022, which use newer MSSTL with this check introduced in June 2022.

jopperm · 2024-06-27T13:14:14Z

Thanks for investigating! So until the use of std::complex<APInt|APFloat> is removed upstream or Microsoft changes their STL implementation, we would have three options:

Revert enforcing the check for deprecated API in the build, document this in the coding guidelines, and catch it in code review.
Only do -Werror=deprecated-declarations on Linux (after all, should be enough to check the code on one platform in the CI).
Define _SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING when compiling on Windows to work around the issue.

Implements approach 2 in #703 (comment), as discussed in the community call. Signed-off-by: Julian Oppermann <[email protected]>

…vm#703) Mechanical rewrite to use the corresponding free functions; fixes llvm#702. I used a slightly modified version of the `clang-tidy` check provided in https://discourse.llvm.org/t/psa-deprecating-cast-isa-methods-in-some-classes/70909 to rewrite the C++ source files, regular expressions for the TableGen files, and manual cleanups where needed (e.g. chains like `x.foo().cast<A>().bar().cast()`) I applied the following heuristic to determine which namespace prefix to use: - If the target type is not qualified, and the TU has `using namespace mlir` or the code is inside the `mlir` namespace -> use a plain `isa`/`cast`/... - Exception: Always qualify inside custom types and attributes, because their base classes define the very members we want to get rid of. - Else. i.e. the target type is qualified as `::mlir::` or `mlir::`, use that prefix. The `clang-tidy` check also rewrote `dyn_cast_or_null` to `dyn_cast_if_present`. I think that's useful because the former variant is going to be deprecated as well in the future. I'm using `-Werror=deprecated-declarations` to test the change (see 6b7420a); this required also changing two occurrences of `StringRef::equals` to `==`. I could also just drop the commit here; maybe we want to enable `-Werror` in general (there aren't too many other warnings left in the codebase). --------- Signed-off-by: Julian Oppermann <[email protected]>

Implements approach 2 in llvm#703 (comment), as discussed in the community call. Signed-off-by: Julian Oppermann <[email protected]>

…vm#703) Mechanical rewrite to use the corresponding free functions; fixes llvm#702. I used a slightly modified version of the `clang-tidy` check provided in https://discourse.llvm.org/t/psa-deprecating-cast-isa-methods-in-some-classes/70909 to rewrite the C++ source files, regular expressions for the TableGen files, and manual cleanups where needed (e.g. chains like `x.foo().cast<A>().bar().cast()`) I applied the following heuristic to determine which namespace prefix to use: - If the target type is not qualified, and the TU has `using namespace mlir` or the code is inside the `mlir` namespace -> use a plain `isa`/`cast`/... - Exception: Always qualify inside custom types and attributes, because their base classes define the very members we want to get rid of. - Else. i.e. the target type is qualified as `::mlir::` or `mlir::`, use that prefix. The `clang-tidy` check also rewrote `dyn_cast_or_null` to `dyn_cast_if_present`. I think that's useful because the former variant is going to be deprecated as well in the future. I'm using `-Werror=deprecated-declarations` to test the change (see 6b7420a); this required also changing two occurrences of `StringRef::equals` to `==`. I could also just drop the commit here; maybe we want to enable `-Werror` in general (there aren't too many other warnings left in the codebase). --------- Signed-off-by: Julian Oppermann <[email protected]>

Implements approach 2 in llvm#703 (comment), as discussed in the community call. Signed-off-by: Julian Oppermann <[email protected]>

…vm#703) Mechanical rewrite to use the corresponding free functions; fixes llvm#702. I used a slightly modified version of the `clang-tidy` check provided in https://discourse.llvm.org/t/psa-deprecating-cast-isa-methods-in-some-classes/70909 to rewrite the C++ source files, regular expressions for the TableGen files, and manual cleanups where needed (e.g. chains like `x.foo().cast<A>().bar().cast()`) I applied the following heuristic to determine which namespace prefix to use: - If the target type is not qualified, and the TU has `using namespace mlir` or the code is inside the `mlir` namespace -> use a plain `isa`/`cast`/... - Exception: Always qualify inside custom types and attributes, because their base classes define the very members we want to get rid of. - Else. i.e. the target type is qualified as `::mlir::` or `mlir::`, use that prefix. The `clang-tidy` check also rewrote `dyn_cast_or_null` to `dyn_cast_if_present`. I think that's useful because the former variant is going to be deprecated as well in the future. I'm using `-Werror=deprecated-declarations` to test the change (see 6b7420a); this required also changing two occurrences of `StringRef::equals` to `==`. I could also just drop the commit here; maybe we want to enable `-Werror` in general (there aren't too many other warnings left in the codebase). --------- Signed-off-by: Julian Oppermann <[email protected]>

Implements approach 2 in llvm#703 (comment), as discussed in the community call. Signed-off-by: Julian Oppermann <[email protected]>

…vm#703) Mechanical rewrite to use the corresponding free functions; fixes llvm#702. I used a slightly modified version of the `clang-tidy` check provided in https://discourse.llvm.org/t/psa-deprecating-cast-isa-methods-in-some-classes/70909 to rewrite the C++ source files, regular expressions for the TableGen files, and manual cleanups where needed (e.g. chains like `x.foo().cast<A>().bar().cast()`) I applied the following heuristic to determine which namespace prefix to use: - If the target type is not qualified, and the TU has `using namespace mlir` or the code is inside the `mlir` namespace -> use a plain `isa`/`cast`/... - Exception: Always qualify inside custom types and attributes, because their base classes define the very members we want to get rid of. - Else. i.e. the target type is qualified as `::mlir::` or `mlir::`, use that prefix. The `clang-tidy` check also rewrote `dyn_cast_or_null` to `dyn_cast_if_present`. I think that's useful because the former variant is going to be deprecated as well in the future. I'm using `-Werror=deprecated-declarations` to test the change (see 6b7420a); this required also changing two occurrences of `StringRef::equals` to `==`. I could also just drop the commit here; maybe we want to enable `-Werror` in general (there aren't too many other warnings left in the codebase). --------- Signed-off-by: Julian Oppermann <[email protected]>

Implements approach 2 in llvm#703 (comment), as discussed in the community call. Signed-off-by: Julian Oppermann <[email protected]>

Mechanical rewrite to use the corresponding free functions; fixes #702. I used a slightly modified version of the `clang-tidy` check provided in https://discourse.llvm.org/t/psa-deprecating-cast-isa-methods-in-some-classes/70909 to rewrite the C++ source files, regular expressions for the TableGen files, and manual cleanups where needed (e.g. chains like `x.foo().cast<A>().bar().cast()`) I applied the following heuristic to determine which namespace prefix to use: - If the target type is not qualified, and the TU has `using namespace mlir` or the code is inside the `mlir` namespace -> use a plain `isa`/`cast`/... - Exception: Always qualify inside custom types and attributes, because their base classes define the very members we want to get rid of. - Else. i.e. the target type is qualified as `::mlir::` or `mlir::`, use that prefix. The `clang-tidy` check also rewrote `dyn_cast_or_null` to `dyn_cast_if_present`. I think that's useful because the former variant is going to be deprecated as well in the future. I'm using `-Werror=deprecated-declarations` to test the change (see 6b7420a); this required also changing two occurrences of `StringRef::equals` to `==`. I could also just drop the commit here; maybe we want to enable `-Werror` in general (there aren't too many other warnings left in the codebase). --------- Signed-off-by: Julian Oppermann <[email protected]>

Implements approach 2 in #703 (comment), as discussed in the community call. Signed-off-by: Julian Oppermann <[email protected]>

Mechanical rewrite to use the corresponding free functions; fixes #702. I used a slightly modified version of the `clang-tidy` check provided in https://discourse.llvm.org/t/psa-deprecating-cast-isa-methods-in-some-classes/70909 to rewrite the C++ source files, regular expressions for the TableGen files, and manual cleanups where needed (e.g. chains like `x.foo().cast<A>().bar().cast()`) I applied the following heuristic to determine which namespace prefix to use: - If the target type is not qualified, and the TU has `using namespace mlir` or the code is inside the `mlir` namespace -> use a plain `isa`/`cast`/... - Exception: Always qualify inside custom types and attributes, because their base classes define the very members we want to get rid of. - Else. i.e. the target type is qualified as `::mlir::` or `mlir::`, use that prefix. The `clang-tidy` check also rewrote `dyn_cast_or_null` to `dyn_cast_if_present`. I think that's useful because the former variant is going to be deprecated as well in the future. I'm using `-Werror=deprecated-declarations` to test the change (see 6b7420a); this required also changing two occurrences of `StringRef::equals` to `==`. I could also just drop the commit here; maybe we want to enable `-Werror` in general (there aren't too many other warnings left in the codebase). --------- Signed-off-by: Julian Oppermann <[email protected]>

Implements approach 2 in #703 (comment), as discussed in the community call. Signed-off-by: Julian Oppermann <[email protected]>

Implements approach 2 in llvm/clangir#703 (comment), as discussed in the community call. Signed-off-by: Julian Oppermann <[email protected]>

jopperm added 5 commits June 26, 2024 10:18

Mechanical rewrite of C++ files using clang-tidy.

7ca389c

Signed-off-by: Julian Oppermann <[email protected]>

Regex-based rewrite of tablegen files; fix remaining C++ occurences.

6cbfd9e

Signed-off-by: Julian Oppermann <[email protected]>

Drop qualifier if code is inside mlir namespace.

af9702e

Signed-off-by: Julian Oppermann <[email protected]>

Roll back dyn_cast -> dyn_cast_if_present.

6f7ea42

Signed-off-by: Julian Oppermann <[email protected]>

Treat deprecation warnings as errors.

6b7420a

Signed-off-by: Julian Oppermann <[email protected]>

jopperm requested review from lanza and bcardosolopes as code owners June 26, 2024 10:14

Use MSVC-specific flag.

aea23d4

Signed-off-by: Julian Oppermann <[email protected]>

bcardosolopes approved these changes Jun 26, 2024

View reviewed changes

bcardosolopes merged commit d5f48dc into llvm:main Jun 26, 2024
6 checks passed

jopperm deleted the isa-cast-dyncast-free-functions branch June 27, 2024 13:14

jopperm mentioned this pull request Jul 3, 2024

[CIR][NFC] Don't enforce deprecated API check on MSVC #718

Merged

bcardosolopes pushed a commit that referenced this pull request Jul 3, 2024

[CIR][NFC] Don't enforce deprecated API check on MSVC (#718)

f7c508c

Implements approach 2 in #703 (comment), as discussed in the community call. Signed-off-by: Julian Oppermann <[email protected]>

lanza pushed a commit that referenced this pull request Nov 5, 2024

[CIR][NFC] Don't enforce deprecated API check on MSVC (#718)

4fe740a

Implements approach 2 in #703 (comment), as discussed in the community call. Signed-off-by: Julian Oppermann <[email protected]>

lanza pushed a commit that referenced this pull request Mar 18, 2025

[CIR][NFC] Don't enforce deprecated API check on MSVC (#718)

a33e071

Implements approach 2 in #703 (comment), as discussed in the community call. Signed-off-by: Julian Oppermann <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CIR][NFC] Replace uses of isa/dyn_cast/cast/... member functions #703

[CIR][NFC] Replace uses of isa/dyn_cast/cast/... member functions #703

jopperm commented Jun 26, 2024

bcardosolopes left a comment

bcardosolopes Jun 26, 2024

seven-mile commented Jun 27, 2024

jopperm commented Jun 27, 2024

[CIR][NFC] Replace uses of isa/dyn_cast/cast/... member functions #703

[CIR][NFC] Replace uses of isa/dyn_cast/cast/... member functions #703

Conversation

jopperm commented Jun 26, 2024

bcardosolopes left a comment

Choose a reason for hiding this comment

bcardosolopes Jun 26, 2024

Choose a reason for hiding this comment

seven-mile commented Jun 27, 2024

jopperm commented Jun 27, 2024