diff options
| author | bors <bors@rust-lang.org> | 2022-09-09 11:58:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-09 11:58:09 +0000 |
| commit | 25912c09710a2de2a97b4904e9b528b73439927d (patch) | |
| tree | 096c7b5f6f76fb303cc500ab7890f1baa86173b1 /src/rustllvm/RustWrapper.cpp | |
| parent | 1ec9b66a12eca9a415ef083235985ab9324d5edc (diff) | |
| parent | c7f8e68194e7ad60623420c4e9ab63ad6ee62257 (diff) | |
| download | rust-25912c09710a2de2a97b4904e9b528b73439927d.tar.gz rust-25912c09710a2de2a97b4904e9b528b73439927d.zip | |
Auto merge of #101320 - RalfJung:beta-ctfe-ptr-provenance, r=pnkfelix
beta-backport of provenance-related CTFE changes This is all part of dealing with https://github.com/rust-lang/rust/issues/99923. The first commit backports the effects of https://github.com/rust-lang/rust/pull/101101. `@pnkfelix` asked for this and it turned out to be easy, so I think this is uncontroversial. The second commit effectively repeats https://github.com/rust-lang/rust/pull/99965, which un-does the effects of https://github.com/rust-lang/rust/pull/97684 and therefore means https://github.com/rust-lang/rust/issues/99923 does not apply to the beta branch. I honestly don't think we should do this; the sentiment in https://github.com/rust-lang/rust/issues/99923 was that we should go ahead with the change but improve diagnostics. But `@pnkfelix` seemed to request such a change so I figured I would offer the option. I'll be on vacation soon, so if you all decide to take the first commit only, then someone please just force-push to this branch and remove the 2nd commit.
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions