Allow reifying intrinsics to fn pointers. (rebase of #86699) #126595

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

The original PR (#86699) died after merge conflicts due to inactivity. This PR is just a rebase of the original with some minor changes to make it fit into the now-nearly-3-years-older rustc. Such as using //@ instead of // for test directives, the removal of Abi::PlatformIntrinsic in #121516, etc.

I am not very familiar with the code surrounding the changes, so review this with caution. There might have been some new problems that popped up during those 3 years that I have no idea about.

Might allow to re-revert #81238.

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

@@ -154,6 +154,7 @@ fn make_shim<'tcx>(tcx: TyCtxt<'tcx>, instance: ty::InstanceDef<'tcx>) -> Body<'
            &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.

rust-log-analyzer · 2024-07-09T22:11:35Z

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)

Getting action download info
Download action repository 'msys2/setup-msys2@v2.22.0' (SHA:cc11e9188b693c2b100158c3322424c4cc1dadea)
Download action repository 'actions/checkout@v4' (SHA:692973e3d937129bcbf40652eb9f2f61becf3332)
Download action repository 'actions/upload-artifact@v4' (SHA:0b2256b8c012f0828dc542b3febcab082c67f72b)
Complete job name: PR - mingw-check-tidy
git config --global core.autocrlf false
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
---
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

COPY host-x86_64/mingw-check/reuse-requirements.txt /tmp/
RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt \
    && pip3 install virtualenv
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.
# 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:lint,cpp:fmt
# 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 [5/8] COPY host-x86_64/mingw-check/reuse-requirements.txt /tmp/
#12 DONE 0.0s

#13 [6/8] RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt     && pip3 install virtualenv
#13 0.405   Downloading binaryornot-0.4.4-py2.py3-none-any.whl (9.0 kB)
#13 0.418 Collecting boolean-py==4.0
#13 0.421   Downloading boolean.py-4.0-py3-none-any.whl (25 kB)
#13 0.433 Collecting chardet==5.1.0
---
#13 3.384 Building wheels for collected packages: reuse
#13 3.385   Building wheel for reuse (pyproject.toml): started
#13 3.701   Building wheel for reuse (pyproject.toml): finished with status 'done'
#13 3.702   Created wheel for reuse: filename=reuse-1.1.0-cp310-cp310-manylinux_2_35_x86_64.whl size=181117 sha256=f5f58750481f69515c2c0d1d503daf565e2565c370d07fc6aeb95fe3498b4269
#13 3.702   Stored in directory: /tmp/pip-ephem-wheel-cache-elohxyot/wheels/c2/3c/b9/1120c2ab4bd82694f7e6f0537dc5b9a085c13e2c69a8d0c76d
#13 3.705 Installing collected packages: boolean-py, binaryornot, setuptools, reuse, python-debian, markupsafe, license-expression, jinja2, chardet
#13 3.726   Attempting uninstall: setuptools
#13 3.726     Found existing installation: setuptools 59.6.0
#13 3.728     Not uninstalling setuptools at /usr/lib/python3/dist-packages, outside environment /usr
#13 3.728     Not uninstalling setuptools at /usr/lib/python3/dist-packages, outside environment /usr
#13 3.728     Can't uninstall 'setuptools'. No files were found to uninstall.
#13 4.391 Successfully installed binaryornot-0.4.4 boolean-py-4.0 chardet-5.1.0 jinja2-3.1.2 license-expression-30.0.0 markupsafe-2.1.1 python-debian-0.1.49 reuse-1.1.0 setuptools-66.0.0
#13 4.392 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
#13 4.887 Collecting virtualenv
#13 4.926   Downloading virtualenv-20.26.3-py3-none-any.whl (5.7 MB)
#13 4.991      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 5.7/5.7 MB 91.3 MB/s eta 0:00:00
#13 5.028 Collecting distlib<1,>=0.3.7
#13 5.033   Downloading distlib-0.3.8-py2.py3-none-any.whl (468 kB)
#13 5.069 Collecting filelock<4,>=3.12.2
#13 5.072   Downloading filelock-3.15.4-py3-none-any.whl (16 kB)
#13 5.072   Downloading filelock-3.15.4-py3-none-any.whl (16 kB)
#13 5.101 Collecting platformdirs<5,>=3.9.1
#13 5.105   Downloading platformdirs-4.2.2-py3-none-any.whl (18 kB)
#13 5.192 Installing collected packages: distlib, platformdirs, filelock, virtualenv
#13 5.362 Successfully installed distlib-0.3.8 filelock-3.15.4 platformdirs-4.2.2 virtualenv-20.26.3
#13 DONE 5.4s

#14 [7/8] COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
#14 DONE 0.0s
---
DirectMap4k:      206784 kB
DirectMap2M:     8181760 kB
DirectMap1G:    10485760 kB
##[endgroup]
Executing TIDY_PRINT_DIFF=1 python2.7 ../x.py test            --stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint,cpp:fmt
+ TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint,cpp:fmt
    Finished `dev` profile [unoptimized] target(s) in 0.03s
##[endgroup]
downloading https://ci-artifacts.rust-lang.org/rustc-builds-alt/9dcaa7f92cf3ed0a9d2e93824025243533bb5541/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz
extracting /checkout/obj/build/cache/llvm-9dcaa7f92cf3ed0a9d2e93824025243533bb5541-true/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz to /checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm
---
##[endgroup]
fmt check
fmt: checked 5238 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-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-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-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'
Requirement already satisfied: pip in ./build/venv/lib/python3.10/site-packages (24.1)
  Downloading pip-24.1.2-py3-none-any.whl.metadata (3.6 kB)
Downloading pip-24.1.2-py3-none-any.whl (1.8 MB)
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 1.8/1.8 MB 21.4 MB/s eta 0:00:00
Installing collected packages: pip
---
checking C++ file formatting
some tidy checks failed


Command BootstrapCommand { command: LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/rustc" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/rust-tidy" "/checkout" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/checkout/obj/build" "4" "--extra-checks=py:lint,cpp:fmt", failure_behavior: DelayFail, stdout: Print, stderr: Print, run_always: false } did not execute successfully.

Build completed unsuccessfully in 0:01:10
  local time: Tue Jul  9 22:11:25 UTC 2024
  network time: Tue, 09 Jul 2024 22:11:25 GMT

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.

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, so needs a completed 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

eddyb added 2 commits July 10, 2024 01:03

Allow reifying intrinsics to fn pointers.

00db2ae

rustc_mir: run the lower_intrinsics pass on MIR shims.

85abfd0

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

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow reifying intrinsics to fn pointers. (rebase of #86699) #126595

Allow reifying intrinsics to fn pointers. (rebase of #86699) #126595

GrigorenkoPV commented Jun 17, 2024 •

edited

Loading

rustbot commented Jun 17, 2024

rustbot commented Jun 17, 2024

This comment has been minimized.

compiler-errors commented Jun 17, 2024

compiler-errors Jul 9, 2024

compiler-errors Jul 9, 2024

compiler-errors left a comment

compiler-errors commented Jul 9, 2024

GrigorenkoPV commented Jul 9, 2024

rust-log-analyzer commented Jul 9, 2024

GrigorenkoPV commented Jul 14, 2024 •

edited

Loading

bors commented Jul 17, 2024

Allow reifying intrinsics to fn pointers. (rebase of #86699) #126595

Are you sure you want to change the base?

Allow reifying intrinsics to fn pointers. (rebase of #86699) #126595

Conversation

GrigorenkoPV commented Jun 17, 2024 • edited Loading

rustbot commented Jun 17, 2024

rustbot commented Jun 17, 2024

This comment has been minimized.

compiler-errors commented Jun 17, 2024

compiler-errors Jul 9, 2024

Choose a reason for hiding this comment

compiler-errors Jul 9, 2024

Choose a reason for hiding this comment

compiler-errors left a comment

Choose a reason for hiding this comment

compiler-errors commented Jul 9, 2024

GrigorenkoPV commented Jul 9, 2024

rust-log-analyzer commented Jul 9, 2024

GrigorenkoPV commented Jul 14, 2024 • edited Loading

bors commented Jul 17, 2024

GrigorenkoPV commented Jun 17, 2024 •

edited

Loading

GrigorenkoPV commented Jul 14, 2024 •

edited

Loading