Allow reifying intrinsics to fn pointers. (rebase of #86699) by GrigorenkoPV · Pull Request #126595 · rust-lang/rust

GrigorenkoPV · 2024-06-17T14:19:34Z

The original PR (#86699) died after merge conflicts due to inactivity.

Might allow to re-revert #81238.

I was able to do a rebase (mostly), but, sadly, I am underqualified to deal with the remaining issues. So, E-help-wanted label.

Current problems:

There is an ICE because of broken MIR (see e8ef4ef). Maybe this can be used to aid solving the issue?
The additions to tests/mir-opt/lower_intrinsics.rs do not actually get tested (this is even reported by tidy). The directives are missing. In the original PR they were in the middle of the function and without any indentation: src. I could not get this to work with the current testing infrastructure. Also see these review comments.

rustbot · 2024-06-17T14:19:43Z

r? @pnkfelix

rustbot has assigned @pnkfelix.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-06-17T14:19:45Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

compiler-errors · 2024-06-17T15:01:48Z

I'll review this soon

compiler-errors · 2024-07-09T20:47:34Z

compiler/rustc_mir_transform/src/shim.rs

            &add_moves_for_packed_drops::AddMovesForPackedDrops,
            &deref_separator::Derefer,
            &remove_noop_landing_pads::RemoveNoopLandingPads,
+            &lower_intrinsics::LowerIntrinsics,


Why was this added?

Actually, I know why. I wonder if it's better to place this in build_call_shim, or even make our own function like build_reified_intrinsic.

compiler-errors

Generally looks fine.

I think this needs a T-types FCP since AFAICT the only way to hit this is on nightly code. Is that last part correct?

Regardless, do you mind writing up a short blurb motivating why we want to do this and explaining the general approach?

compiler-errors · 2024-07-09T20:51:18Z

First this needs a rebase and also please fix the CI issues

@rustbot author

GrigorenkoPV · 2024-07-09T22:06:34Z

First this needs a rebase

Done

and also please fix the CI issues

Sorry, I've tried, but couldn't figure out what the problem was and why it didn't pick up the mir test. I would appreciate if somebody could help me here.

GrigorenkoPV · 2024-07-14T20:23:28Z

@rustbot label +E-help-wanted

bors · 2024-07-17T00:50:01Z

☔ The latest upstream changes (presumably #127831) made this pull request unmergeable. Please resolve the merge conflicts.

jieyouxu · 2024-10-28T08:21:06Z

tests/mir-opt/lower_intrinsics.rs

+
+// Check that the MIR shims used for reifying intrinsics to `fn` pointers,
+// also go through the lowering pass.
+pub fn reify_intrinsics() -> impl Copy {


Maybe

// EMIT_MIR lower_intrinsics.reify_intrinsics.LowerIntrinsics.mir

?

Well, I think this should be a .diff to preserve the original intentions. Plus I was not able to make it generate the same code as in #86699.

GrigorenkoPV · 2024-10-28T12:58:54Z

I've rebased and found a place where this ICEs. I am not sure whether the ICE was there originally or it got introduced after one of the rebases.

GrigorenkoPV · 2024-10-28T18:04:06Z

I've rebased and found a place where this ICEs. I am not sure whether the ICE was there originally or it got introduced after one of the rebases.

I've checked and this ICE has been present since the first version of this PR. I was not able to check whether it existed in the original #86699, because I couldn't get that old version of the compiler to build.

Dylan-DPC · 2025-02-09T08:46:19Z

@GrigorenkoPV any updates on this? thanks

rust-log-analyzer · 2025-02-09T23:35:22Z

The job mingw-check-tidy failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

info: removing rustup binaries
info: rustup is uninstalled
##[group]Image checksum input
mingw-check-tidy
# We use the ghcr base image because ghcr doesn't have a rate limit
# and the mingw-check-tidy job doesn't cache docker images in CI.
FROM ghcr.io/rust-lang/ubuntu:22.04
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
---

COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/

# NOTE: intentionally uses python2 for x.py so we can test it still works.
# validate-toolstate only runs in our CI, so it's ok for it to only support python3.
ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \
           --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
#    pip-compile --allow-unsafe --generate-hashes reuse-requirements.in
---
#12 2.798 Building wheels for collected packages: reuse
#12 2.800   Building wheel for reuse (pyproject.toml): started
#12 3.007   Building wheel for reuse (pyproject.toml): finished with status 'done'
#12 3.008   Created wheel for reuse: filename=reuse-4.0.3-cp310-cp310-manylinux_2_35_x86_64.whl size=132719 sha256=be6760d5849de4a58bbe52b85ca57a55f2b32b518b17029a5ad2e530db0d4303
#12 3.008   Stored in directory: /tmp/pip-ephem-wheel-cache-2ssrxpj7/wheels/3d/8d/0a/e0fc6aba4494b28a967ab5eaf951c121d9c677958714e34532
#12 3.011 Installing collected packages: boolean-py, binaryornot, tomlkit, reuse, python-debian, markupsafe, license-expression, jinja2, chardet, attrs
#12 3.400 Successfully installed attrs-23.2.0 binaryornot-0.4.4 boolean-py-4.0 chardet-5.2.0 jinja2-3.1.4 license-expression-30.3.0 markupsafe-2.1.5 python-debian-0.1.49 reuse-4.0.3 tomlkit-0.13.0
#12 3.401 WARNING: Running pip as the 'root' user can result in broken permissions and conflicting behaviour with the system package manager. It is recommended to use a virtual environment instead: https://pip.pypa.io/warnings/venv
#12 3.915 Collecting virtualenv
#12 3.915 Collecting virtualenv
#12 3.957   Downloading virtualenv-20.29.1-py3-none-any.whl (4.3 MB)
#12 4.056      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 4.3/4.3 MB 44.2 MB/s eta 0:00:00
#12 4.112 Collecting filelock<4,>=3.12.2
#12 4.116   Downloading filelock-3.17.0-py3-none-any.whl (16 kB)
#12 4.150 Collecting platformdirs<5,>=3.9.1
#12 4.154   Downloading platformdirs-4.3.6-py3-none-any.whl (18 kB)
#12 4.173 Collecting distlib<1,>=0.3.7
#12 4.184      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 469.0/469.0 KB 82.3 MB/s eta 0:00:00
#12 4.184      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 469.0/469.0 KB 82.3 MB/s eta 0:00:00
#12 4.264 Installing collected packages: distlib, platformdirs, filelock, virtualenv
#12 4.442 Successfully installed distlib-0.3.9 filelock-3.17.0 platformdirs-4.3.6 virtualenv-20.29.1
#12 DONE 4.5s

#13 [7/8] COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
#13 DONE 0.0s
---
DirectMap4k:      133056 kB
DirectMap2M:     5109760 kB
DirectMap1G:    13631488 kB
##[endgroup]
Executing TIDY_PRINT_DIFF=1 python2.7 ../x.py test            --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp
+ TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp
    Finished `dev` profile [unoptimized] target(s) in 0.05s
##[endgroup]
WARN: currently no CI rustc builds have rustc debug assertions enabled. Please either set `rust.debug-assertions` to `false` if you want to use download CI rustc or set `rust.download-rustc` to `false`.
downloading https://static.rust-lang.org/dist/2025-02-08/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz
---
##[endgroup]
fmt check
fmt: checked 5835 files
tidy check
tidy error: the following output file is not associated with any mir-opt test, you can remove it: /checkout/tests/mir-opt/lower_intrinsics.core.intrinsics-#1-forget.LowerIntrinsics.diff
tidy error: the following output file is not associated with any mir-opt test, you can remove it: /checkout/tests/mir-opt/lower_intrinsics.core.intrinsics-#1-size_of.LowerIntrinsics.diff
tidy error: the following output file is not associated with any mir-opt test, you can remove it: /checkout/tests/mir-opt/lower_intrinsics.core.intrinsics-#1-discriminant_value.LowerIntrinsics.diff
tidy error: the following output file is not associated with any mir-opt test, you can remove it: /checkout/tests/mir-opt/lower_intrinsics.core.intrinsics-#1-unreachable.LowerIntrinsics.diff
tidy error: the following output file is not associated with any mir-opt test, you can remove it: /checkout/tests/mir-opt/lower_intrinsics.core.intrinsics-#1-wrapping_add.LowerIntrinsics.diff
removing old virtual environment
removing old virtual environment
creating virtual environment at '/checkout/obj/build/venv' using 'python3.10' and 'venv'
creating virtual environment at '/checkout/obj/build/venv' using 'python3.10' and 'virtualenv'
Requirement already satisfied: pip in ./build/venv/lib/python3.10/site-packages (24.3.1)
  Downloading pip-25.0.1-py3-none-any.whl.metadata (3.7 kB)
Downloading pip-25.0.1-py3-none-any.whl (1.8 MB)
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 1.8/1.8 MB 114.0 MB/s eta 0:00:00
Installing collected packages: pip
---
All checks passed!
checking python file formatting
28 files already formatted
checking C++ file formatting
some tidy checks failed
Command has failed. Rerun with -v to see more details.
  local time: Sun Feb  9 23:35:10 UTC 2025
  network time: Sun, 09 Feb 2025 23:35:11 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

GrigorenkoPV · 2025-02-09T23:45:29Z

@GrigorenkoPV any updates on this? thanks

I've rebased to resolve the merge conflicts. As for the remaining issues (outlined them in the OP), I am underqualified to resolve those on my own. I would either need some help with this, or someone to take over the PR entirely. Alternatively, I could try to just brute-force my way through, gaining the qualification in process, but that would take more time than I can currently dedicate to this, sadly.

bors · 2025-03-01T15:16:27Z

☔ The latest upstream changes (presumably #137848) made this pull request unmergeable. Please resolve the merge conflicts.

Dylan-DPC · 2025-06-27T07:07:08Z

Closing this because this is inactive and the author has said that they do not have the time for continuing with this

rustbot assigned pnkfelix Jun 17, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 17, 2024

This comment has been minimized.

Sign in to view

compiler-errors assigned compiler-errors and unassigned pnkfelix Jun 17, 2024

compiler-errors added the needs-fcp This change is insta-stable, or significant enough to need a team FCP to proceed. label Jul 9, 2024

compiler-errors reviewed Jul 9, 2024

View reviewed changes

compiler-errors approved these changes Jul 9, 2024

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 9, 2024

GrigorenkoPV force-pushed the reify-intrinsics branch from 572fbdc to 85abfd0 Compare July 9, 2024 22:05

This comment has been minimized.

Sign in to view

rustbot added the E-help-wanted Call for participation: Help is requested to fix this issue. label Jul 14, 2024

jieyouxu reviewed Oct 28, 2024

View reviewed changes

GrigorenkoPV force-pushed the reify-intrinsics branch from 85abfd0 to 6ae6dd5 Compare October 28, 2024 12:57

This comment has been minimized.

Sign in to view

eddyb and others added 3 commits February 10, 2025 02:00

Allow reifying intrinsics to fn pointers.

0e10c39

rustc_mir: run the lower_intrinsics pass on MIR shims.

1aed382

This ICEs

e8ef4ef

GrigorenkoPV force-pushed the reify-intrinsics branch from 6ae6dd5 to e8ef4ef Compare February 9, 2025 23:26

Dylan-DPC closed this Jun 27, 2025

Uh oh!

Conversation

GrigorenkoPV commented Jun 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 17, 2024

Uh oh!

rustbot commented Jun 17, 2024

Uh oh!

This comment has been minimized.

compiler-errors commented Jun 17, 2024

Uh oh!

compiler-errors Jul 9, 2024

Choose a reason for hiding this comment

Uh oh!

compiler-errors Jul 9, 2024

Choose a reason for hiding this comment

Uh oh!

compiler-errors left a comment

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Jul 9, 2024

Uh oh!

GrigorenkoPV commented Jul 9, 2024

Uh oh!

This comment has been minimized.

GrigorenkoPV commented Jul 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Jul 17, 2024

Uh oh!

jieyouxu Oct 28, 2024

Choose a reason for hiding this comment

Uh oh!

GrigorenkoPV Oct 28, 2024

Choose a reason for hiding this comment

Uh oh!

GrigorenkoPV commented Oct 28, 2024

Uh oh!

This comment has been minimized.

GrigorenkoPV commented Oct 28, 2024

Uh oh!

Dylan-DPC commented Feb 9, 2025

Uh oh!

rust-log-analyzer commented Feb 9, 2025

Uh oh!

GrigorenkoPV commented Feb 9, 2025

Uh oh!

bors commented Mar 1, 2025

Uh oh!

Dylan-DPC commented Jun 27, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

GrigorenkoPV commented Jun 17, 2024 •

edited

Loading

GrigorenkoPV commented Jul 14, 2024 •

edited

Loading