Fix ICE when passing DefId-creating args to legacy_const_generics. by veluca93 · Pull Request #130443 · rust-lang/rust (original) (raw)
rustbot added S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
Relevant to the compiler team, which will review and decide on the PR/issue.
labels
bors added a commit to rust-lang-ci/rust that referenced this pull request
…r=
Fix ICE when passing DefId-creating args to legacy_const_generics.
r? BoxyUwU
Fixes rust-lang#123077
bors added a commit to rust-lang-ci/rust that referenced this pull request
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request
This MR contains the following updates:
| Package | Update | Change |
|---|---|---|
| rust | minor | 1.83.0 -> 1.84.0 |
MR created with the help of el-capitano/tools/renovate-bot.
Proposed changes to behavior should be submitted there as MRs.
Release Notes
rust-lang/rust (rust)
v1.84.0
==========================
Language
- Allow
#[deny]inside#[forbid]as a no-op - Show a warning when
-Ctarget-featureis used to toggle features that can lead to unsoundness due to ABI mismatches - Use the next-generation trait solver in coherence
- Allow coercions to drop the principal of trait objects
- Support
/as the path separator forinclude!()in all cases on Windows - Taking a raw ref (
raw (const|mut)) of a deref of a pointer (*ptr) is now safe - Stabilize s390x inline assembly
- Stabilize Arm64EC inline assembly
- Lint against creating pointers to immediately dropped temporaries
- Execute drop glue when unwinding in an
extern "C"function
Compiler
- Add
--print host-tupleflag to print the host target tuple and affirm the "target tuple" terminology over "target triple" - Declaring functions with a calling convention not supported on the current target now triggers a hard error
- Set up indirect access to external data for
loongarch64-unknown-linux-{musl,ohos} - Enable XRay instrumentation for LoongArch Linux targets
- Extend the
unexpected_cfgslint to also warn in external macros - Stabilize WebAssembly
multivalue,reference-types, andtail-calltarget features - Added Tier 2 support for the
wasm32v1-nonetarget
Libraries
- Implement
From<&mut {slice}>forBox/Rc/Arc<{slice}> - Move
<float>::copysign,<float>::abs,<float>::signumtocore - Add
LowerExpandUpperExpimplementations toNonZero - Implement
FromStrforCStringandTryFrom<CString>forString std::os::darwinhas been made public
Stabilized APIs
Ipv6Addr::is_unique_localIpv6Addr::is_unicast_link_localcore::ptr::with_exposed_provenancecore::ptr::with_exposed_provenance_mut<ptr>::addr<ptr>::expose_provenance<ptr>::with_addr<ptr>::map_addr<int>::isqrt<int>::checked_isqrt<uint>::isqrtNonZero::isqrtcore::ptr::without_provenancecore::ptr::without_provenance_mutcore::ptr::danglingcore::ptr::dangling_mutPin::as_deref_mut
These APIs are now stable in const contexts
AtomicBool::from_ptrAtomicPtr::from_ptrAtomicU8::from_ptrAtomicU16::from_ptrAtomicU32::from_ptrAtomicU64::from_ptrAtomicUsize::from_ptrAtomicI8::from_ptrAtomicI16::from_ptrAtomicI32::from_ptrAtomicI64::from_ptrAtomicIsize::from_ptr<ptr>::is_null<ptr>::as_ref<ptr>::as_mutPin::newPin::new_uncheckedPin::get_refPin::into_refPin::get_mutPin::get_unchecked_mutPin::static_refPin::static_mut
Cargo
Rustdoc
Compatibility Notes
- Enable by default the
LSXtarget feature for LoongArch Linux targets - The unstable
-Zprofileflag (“gcov-style” coverage instrumentation) has been removed. This does not affect the stable flags for coverage instrumentation (-Cinstrument-coverage) and profile-guided optimization (-Cprofile-generate,-Cprofile-use), which are unrelated and remain available. - Support for the target named
wasm32-wasihas been removed as the target is now namedwasm32-wasip1. This completes the transition plan for this target following the introduction ofwasm32-wasip1in Rust 1.78. Compiler warnings on use ofwasm32-wasiintroduced in Rust 1.81 are now gone as well as the target is removed. - [The syntax
&pin (mut|const) Tis now parsed as a type which in theory could affect macro expansion results in some edge cases](rust-lang/rust#130635 (comment)) - [Legacy syntax for calling
std::archfunctions is no longer permitted to declare items or bodies (such as closures, inline consts, or async blocks).](rust-lang/rust#130443 (comment)) - Declaring functions with a calling convention not supported on the current target now triggers a hard error
- The next-generation trait solver is now enabled for coherence, fixing multiple soundness issues
Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this MR and you won't be reminded about this update again.
- If you want to rebase/retry this MR, check this box
This MR has been generated by Renovate Bot.
wip-sync pushed a commit to NetBSD/pkgsrc-wip that referenced this pull request
Pkgsrc changes:
- Adapt patches, one of the patched files were restructured upstream.
- Checksum changes.
Upstream changes:
Version 1.84.1 (2025-01-30)
- [Fix ICE 132920 in duplicate-crate diagnostics.] (rust-lang/rust#133304)
- [Fix errors for overlapping impls in incremental rebuilds.] (rust-lang/rust#133828)
- [Fix slow compilation related to the next-generation trait solver.] (rust-lang/rust#135618)
- [Fix debuginfo when LLVM's location discriminator value limit is exceeded.] (rust-lang/rust#135643)
- Fixes for building Rust from source:
- [Only try to distribute
llvm-objcopyif llvm tools are enabled.] (rust-lang/rust#134240) - [Add Profile Override for Non-Git Sources.] (rust-lang/rust#135433)
- [Resolve symlinks of LLVM tool binaries before copying them.] (rust-lang/rust#135585)
- [Make it possible to use ci-rustc on tarball sources.] (rust-lang/rust#135722)
- [Only try to distribute
Version 1.84.0 (2025-01-09)
Language
- [Allow
#[deny]inside#[forbid]as a no-op] (rust-lang/rust#121560) - [Show a warning when
-Ctarget-featureis used to toggle features that can lead to unsoundness due to ABI mismatches] (rust-lang/rust#129884) - [Use the next-generation trait solver in coherence] (rust-lang/rust#130654)
- [Allow coercions to drop the principal of trait objects] (rust-lang/rust#131857)
- [Support
/as the path separator forinclude!()in all cases on Windows] (rust-lang/rust#125205) - [Taking a raw ref (
raw (const|mut)) of a deref of a pointer (*ptr) is now safe] (rust-lang/rust#129248) - [Stabilize s390x inline assembly] (rust-lang/rust#131258)
- [Stabilize Arm64EC inline assembly] (rust-lang/rust#131781)
- [Lint against creating pointers to immediately dropped temporaries] (rust-lang/rust#128985)
- [Execute drop glue when unwinding in an
extern "C"function] (rust-lang/rust#129582)
Compiler
- [Add
--print host-tupleflag to print the host target tuple and affirm the "target tuple" terminology over "target triple"] (rust-lang/rust#125579) - [Declaring functions with a calling convention not supported on the current target now triggers a hard error] (rust-lang/rust#129935)
- [Set up indirect access to external data for
loongarch64-unknown-linux-{musl,ohos}] (rust-lang/rust#131583) - [Enable XRay instrumentation for LoongArch Linux targets] (rust-lang/rust#131818)
- [Extend the
unexpected_cfgslint to also warn in external macros] (rust-lang/rust#132577) - [Stabilize WebAssembly
multivalue,reference-types, andtail-calltarget features] (rust-lang/rust#131080) - [Added Tier 2 support for the
wasm32v1-nonetarget] (rust-lang/rust#131487)
Libraries
- [Implement
From<&mut {slice}>forBox/Rc/Arc<{slice}>] (rust-lang/rust#129329) - [Move
<float>::copysign,<float>::abs,<float>::signumtocore] (rust-lang/rust#131304) - [Add
LowerExpandUpperExpimplementations toNonZero] (rust-lang/rust#131377) - [Implement
FromStrforCStringandTryFrom<CString>forString] (rust-lang/rust#130608) - [
std::os::darwinhas been made public] (rust-lang/rust#130635)
Stabilized APIs
- [
Ipv6Addr::is_unique_local] (https://doc.rust-lang.org/stable/core/net/struct.Ipv6Addr.html#method.is_unique_local) - [
Ipv6Addr::is_unicast_link_local] (https://doc.rust-lang.org/stable/core/net/struct.Ipv6Addr.html#method.is_unicast_link_local) - [
core::ptr::with_exposed_provenance] (https://doc.rust-lang.org/stable/core/ptr/fn.with_exposed_provenance.html) - [
core::ptr::with_exposed_provenance_mut] (https://doc.rust-lang.org/stable/core/ptr/fn.with_exposed_provenance_mut.html) - [
<ptr>::addr] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.addr) - [
<ptr>::expose_provenance] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.expose_provenance) - [
<ptr>::with_addr] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.with_addr) - [
<ptr>::map_addr] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.map_addr) - [
<int>::isqrt] (https://doc.rust-lang.org/stable/core/primitive.i32.html#method.isqrt) - [
<int>::checked_isqrt] (https://doc.rust-lang.org/stable/core/primitive.i32.html#method.checked_isqrt) - [
<uint>::isqrt] (https://doc.rust-lang.org/stable/core/primitive.u32.html#method.isqrt) - [
NonZero::isqrt] (https://doc.rust-lang.org/stable/core/num/struct.NonZero.html#impl-NonZero%3Cu128%3E/method.isqrt) - [
core::ptr::without_provenance] (https://doc.rust-lang.org/stable/core/ptr/fn.without_provenance.html) - [
core::ptr::without_provenance_mut] (https://doc.rust-lang.org/stable/core/ptr/fn.without_provenance_mut.html) - [
core::ptr::dangling] (https://doc.rust-lang.org/stable/core/ptr/fn.dangling.html) - [
core::ptr::dangling_mut] (https://doc.rust-lang.org/stable/core/ptr/fn.dangling_mut.html)
These APIs are now stable in const contexts
- [
AtomicBool::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicBool.html#method.from_ptr) - [
AtomicPtr::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicPtr.html#method.from_ptr) - [
AtomicU8::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicU8.html#method.from_ptr) - [
AtomicU16::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicU16.html#method.from_ptr) - [
AtomicU32::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicU32.html#method.from_ptr) - [
AtomicU64::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicU64.html#method.from_ptr) - [
AtomicUsize::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicUsize.html#method.from_ptr) - [
AtomicI8::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicI8.html#method.from_ptr) - [
AtomicI16::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicI16.html#method.from_ptr) - [
AtomicI32::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicI32.html#method.from_ptr) - [
AtomicI64::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicI64.html#method.from_ptr) - [
AtomicIsize::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicIsize.html#method.from_ptr) - [
<ptr>::is_null] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.is_null-1) - [
<ptr>::as_ref] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.as_ref-1) - [
<ptr>::as_mut] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.as_mut) - [
Pin::new] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.new) - [
Pin::new_unchecked] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.new_unchecked) - [
Pin::get_ref] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.get_ref) - [
Pin::into_ref] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.into_ref) - [
Pin::get_mut] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.get_mut) - [
Pin::get_unchecked_mut] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.get_unchecked_mut) - [
Pin::static_ref] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.static_ref) - [
Pin::static_mut] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.static_mut)
Cargo
- [Stabilize MSRV-aware resolver config] (rust-lang/cargo#14639)
- [Stabilize resolver v3] (rust-lang/cargo#14754)
Rustdoc
- [rustdoc-search: improve type-driven search] (rust-lang/rust#127589)
Compatibility Notes
- [Enable by default the
LSXtarget feature for LoongArch Linux targets] (rust-lang/rust#132140) - The unstable
-Zprofileflag ("gcov-style" coverage instrumentation) has been removed. This does not affect the stable flags for coverage instrumentation (-Cinstrument-coverage) and profile-guided optimization (-Cprofile-generate,-Cprofile-use), which are unrelated and remain available. - Support for the target named
wasm32-wasihas been removed as the target is now namedwasm32-wasip1. This completes the [transition] (rust-lang/compiler-team#607) plan for this target following [the introduction ofwasm32-wasip1] (rust-lang/rust#120468) in Rust 1.78. Compiler warnings on [use ofwasm32-wasi] (rust-lang/rust#126662) introduced in Rust 1.81 are now gone as well as the target is removed. - [The syntax
&pin (mut|const) Tis now parsed as a type which in theory could affect macro expansion results in some edge cases] (rust-lang/rust#130635 (comment)) - [Legacy syntax for calling
std::archfunctions is no longer permitted to declare items or bodies (such as closures, inline consts, or async blocks).] (rust-lang/rust#130443 (comment)) - The
wasm32-unknown-emscriptentarget's binary release of the standard library is now [built with the latest emsdk 3.1.68] (rust-lang/rust#131533), which fixes an ABI-incompatibility with Emscripten >= 3.1.42. If you are locally using a version of emsdk with an incompatible ABI (e.g. before 3.1.42 or a future one), you should build your code with-Zbuild-stdto ensure thatstduses the correct ABI. - [Declaring functions with a calling convention not supported on the current target now triggers a hard error] (rust-lang/rust#129935)
- [The next-generation trait solver is now enabled for coherence, fixing multiple soundness issues] (rust-lang/rust#130654)
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request
…-obk
Give global_asm a fake body to store typeck results, represent sym fn as a hir expr to fix sym fn operands with lifetimes
There are a few intertwined problems with sym fn operands in both inline and global asm macros.
Specifically, unlike other anon consts, they may evaluate to a type with free regions in them without actually having an item-level type annotation to give them a "proper" type. This is in contrast to named constants, which always have an item-level type annotation, or unnamed constants which are constrained by their position (e.g. a const arg in a turbofish, or a const array length).
Today, we infer the type of the operand by looking at the HIR typeck results; however, those results are region-erased, so during borrowck we ICE since we don't expect to encounter erased regions. We can't just fill this type with something like 'static, since we may want to use real (free) regions:
fn foo<'a>() {
asm!("/* ... */", sym bar::<&'a ()>);
}The first idea may be to represent sym fn operands using inline consts instead of anon consts. This makes sense, since inline consts can reference regions from the parent body (like the 'a in the example above). However, this introduces a problem with global_asm!, which doesn't have a parent body; inline consts must be associated with a parent body since they are not a body owner of their own. In rust-lang#116087, I attempted to fix this by using two separate sym operands for global and inline asm. However, this led to a lot of confusion and also some unattractive code duplication.
In this PR, I adjust the lowering of global_asm! so that it's lowered in a "fake" HIR body. This body contains a single expression which is ExprKind::InlineAsm; we don't use this HIR body, but it's used in typeck and borrowck so that we can properly infer and validate the the lifetimes of sym fn operands.
I then adjust the lowering of sym fn to instead be represented with a HIR expression. This is both because it's no longer necessary to represent this operand as an anon const, since it's just a path expression, and also more importantly to sidestep yet another ICE (rust-lang#137179), which has to do with the existing code breaking an invariant of def-id creation and anon consts. Specifically, we are not allowed to synthesize a def-id for an anon const when that anon const contains expressions with def-ids whose parent is not that anon const. This is somewhat related to rust-lang#130443 (comment), which is also a place in the compiler where synthesizing anon consts leads to def-id parenting issue.
As a side-effect, this consolidates the type checking for inline and global asm, so it allows us to simplify InlineAsmCtxt a bit. It also allows us to delete a bit of hacky code from anon const type_of which was there to detect sym fn operands specifically. This also could be generalized to support const asm operands with types with lifetimes in them. Since we specifically reject these consts today, I'm not going to change the representation of those consts (but they'd just be turned into inline consts).
r? oli-obk -- mostly b/c you're patient and also understand the breadth of the code that this touches, please reassign if you don't want to review this.
Fixes rust-lang#111709 Fixes rust-lang#96304 Fixes rust-lang#137179
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request
…-obk
Give global_asm a fake body to store typeck results, represent sym fn as a hir expr to fix sym fn operands with lifetimes
There are a few intertwined problems with sym fn operands in both inline and global asm macros.
Specifically, unlike other anon consts, they may evaluate to a type with free regions in them without actually having an item-level type annotation to give them a "proper" type. This is in contrast to named constants, which always have an item-level type annotation, or unnamed constants which are constrained by their position (e.g. a const arg in a turbofish, or a const array length).
Today, we infer the type of the operand by looking at the HIR typeck results; however, those results are region-erased, so during borrowck we ICE since we don't expect to encounter erased regions. We can't just fill this type with something like 'static, since we may want to use real (free) regions:
fn foo<'a>() {
asm!("/* ... */", sym bar::<&'a ()>);
}The first idea may be to represent sym fn operands using inline consts instead of anon consts. This makes sense, since inline consts can reference regions from the parent body (like the 'a in the example above). However, this introduces a problem with global_asm!, which doesn't have a parent body; inline consts must be associated with a parent body since they are not a body owner of their own. In rust-lang#116087, I attempted to fix this by using two separate sym operands for global and inline asm. However, this led to a lot of confusion and also some unattractive code duplication.
In this PR, I adjust the lowering of global_asm! so that it's lowered in a "fake" HIR body. This body contains a single expression which is ExprKind::InlineAsm; we don't use this HIR body, but it's used in typeck and borrowck so that we can properly infer and validate the the lifetimes of sym fn operands.
I then adjust the lowering of sym fn to instead be represented with a HIR expression. This is both because it's no longer necessary to represent this operand as an anon const, since it's just a path expression, and also more importantly to sidestep yet another ICE (rust-lang#137179), which has to do with the existing code breaking an invariant of def-id creation and anon consts. Specifically, we are not allowed to synthesize a def-id for an anon const when that anon const contains expressions with def-ids whose parent is not that anon const. This is somewhat related to rust-lang#130443 (comment), which is also a place in the compiler where synthesizing anon consts leads to def-id parenting issue.
As a side-effect, this consolidates the type checking for inline and global asm, so it allows us to simplify InlineAsmCtxt a bit. It also allows us to delete a bit of hacky code from anon const type_of which was there to detect sym fn operands specifically. This also could be generalized to support const asm operands with types with lifetimes in them. Since we specifically reject these consts today, I'm not going to change the representation of those consts (but they'd just be turned into inline consts).
r? oli-obk -- mostly b/c you're patient and also understand the breadth of the code that this touches, please reassign if you don't want to review this.
Fixes rust-lang#111709 Fixes rust-lang#96304 Fixes rust-lang#137179
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request
…-obk
Give global_asm a fake body to store typeck results, represent sym fn as a hir expr to fix sym fn operands with lifetimes
There are a few intertwined problems with sym fn operands in both inline and global asm macros.
Specifically, unlike other anon consts, they may evaluate to a type with free regions in them without actually having an item-level type annotation to give them a "proper" type. This is in contrast to named constants, which always have an item-level type annotation, or unnamed constants which are constrained by their position (e.g. a const arg in a turbofish, or a const array length).
Today, we infer the type of the operand by looking at the HIR typeck results; however, those results are region-erased, so during borrowck we ICE since we don't expect to encounter erased regions. We can't just fill this type with something like 'static, since we may want to use real (free) regions:
fn foo<'a>() {
asm!("/* ... */", sym bar::<&'a ()>);
}The first idea may be to represent sym fn operands using inline consts instead of anon consts. This makes sense, since inline consts can reference regions from the parent body (like the 'a in the example above). However, this introduces a problem with global_asm!, which doesn't have a parent body; inline consts must be associated with a parent body since they are not a body owner of their own. In rust-lang#116087, I attempted to fix this by using two separate sym operands for global and inline asm. However, this led to a lot of confusion and also some unattractive code duplication.
In this PR, I adjust the lowering of global_asm! so that it's lowered in a "fake" HIR body. This body contains a single expression which is ExprKind::InlineAsm; we don't use this HIR body, but it's used in typeck and borrowck so that we can properly infer and validate the the lifetimes of sym fn operands.
I then adjust the lowering of sym fn to instead be represented with a HIR expression. This is both because it's no longer necessary to represent this operand as an anon const, since it's just a path expression, and also more importantly to sidestep yet another ICE (rust-lang#137179), which has to do with the existing code breaking an invariant of def-id creation and anon consts. Specifically, we are not allowed to synthesize a def-id for an anon const when that anon const contains expressions with def-ids whose parent is not that anon const. This is somewhat related to rust-lang#130443 (comment), which is also a place in the compiler where synthesizing anon consts leads to def-id parenting issue.
As a side-effect, this consolidates the type checking for inline and global asm, so it allows us to simplify InlineAsmCtxt a bit. It also allows us to delete a bit of hacky code from anon const type_of which was there to detect sym fn operands specifically. This also could be generalized to support const asm operands with types with lifetimes in them. Since we specifically reject these consts today, I'm not going to change the representation of those consts (but they'd just be turned into inline consts).
r? oli-obk -- mostly b/c you're patient and also understand the breadth of the code that this touches, please reassign if you don't want to review this.
Fixes rust-lang#111709 Fixes rust-lang#96304 Fixes rust-lang#137179
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request
…-obk
Give global_asm a fake body to store typeck results, represent sym fn as a hir expr to fix sym fn operands with lifetimes
There are a few intertwined problems with sym fn operands in both inline and global asm macros.
Specifically, unlike other anon consts, they may evaluate to a type with free regions in them without actually having an item-level type annotation to give them a "proper" type. This is in contrast to named constants, which always have an item-level type annotation, or unnamed constants which are constrained by their position (e.g. a const arg in a turbofish, or a const array length).
Today, we infer the type of the operand by looking at the HIR typeck results; however, those results are region-erased, so during borrowck we ICE since we don't expect to encounter erased regions. We can't just fill this type with something like 'static, since we may want to use real (free) regions:
fn foo<'a>() {
asm!("/* ... */", sym bar::<&'a ()>);
}The first idea may be to represent sym fn operands using inline consts instead of anon consts. This makes sense, since inline consts can reference regions from the parent body (like the 'a in the example above). However, this introduces a problem with global_asm!, which doesn't have a parent body; inline consts must be associated with a parent body since they are not a body owner of their own. In rust-lang#116087, I attempted to fix this by using two separate sym operands for global and inline asm. However, this led to a lot of confusion and also some unattractive code duplication.
In this PR, I adjust the lowering of global_asm! so that it's lowered in a "fake" HIR body. This body contains a single expression which is ExprKind::InlineAsm; we don't use this HIR body, but it's used in typeck and borrowck so that we can properly infer and validate the the lifetimes of sym fn operands.
I then adjust the lowering of sym fn to instead be represented with a HIR expression. This is both because it's no longer necessary to represent this operand as an anon const, since it's just a path expression, and also more importantly to sidestep yet another ICE (rust-lang#137179), which has to do with the existing code breaking an invariant of def-id creation and anon consts. Specifically, we are not allowed to synthesize a def-id for an anon const when that anon const contains expressions with def-ids whose parent is not that anon const. This is somewhat related to rust-lang#130443 (comment), which is also a place in the compiler where synthesizing anon consts leads to def-id parenting issue.
As a side-effect, this consolidates the type checking for inline and global asm, so it allows us to simplify InlineAsmCtxt a bit. It also allows us to delete a bit of hacky code from anon const type_of which was there to detect sym fn operands specifically. This also could be generalized to support const asm operands with types with lifetimes in them. Since we specifically reject these consts today, I'm not going to change the representation of those consts (but they'd just be turned into inline consts).
r? oli-obk -- mostly b/c you're patient and also understand the breadth of the code that this touches, please reassign if you don't want to review this.
Fixes rust-lang#111709 Fixes rust-lang#96304 Fixes rust-lang#137179
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request
…-obk
Give global_asm a fake body to store typeck results, represent sym fn as a hir expr to fix sym fn operands with lifetimes
There are a few intertwined problems with sym fn operands in both inline and global asm macros.
Specifically, unlike other anon consts, they may evaluate to a type with free regions in them without actually having an item-level type annotation to give them a "proper" type. This is in contrast to named constants, which always have an item-level type annotation, or unnamed constants which are constrained by their position (e.g. a const arg in a turbofish, or a const array length).
Today, we infer the type of the operand by looking at the HIR typeck results; however, those results are region-erased, so during borrowck we ICE since we don't expect to encounter erased regions. We can't just fill this type with something like 'static, since we may want to use real (free) regions:
fn foo<'a>() {
asm!("/* ... */", sym bar::<&'a ()>);
}The first idea may be to represent sym fn operands using inline consts instead of anon consts. This makes sense, since inline consts can reference regions from the parent body (like the 'a in the example above). However, this introduces a problem with global_asm!, which doesn't have a parent body; inline consts must be associated with a parent body since they are not a body owner of their own. In rust-lang#116087, I attempted to fix this by using two separate sym operands for global and inline asm. However, this led to a lot of confusion and also some unattractive code duplication.
In this PR, I adjust the lowering of global_asm! so that it's lowered in a "fake" HIR body. This body contains a single expression which is ExprKind::InlineAsm; we don't use this HIR body, but it's used in typeck and borrowck so that we can properly infer and validate the the lifetimes of sym fn operands.
I then adjust the lowering of sym fn to instead be represented with a HIR expression. This is both because it's no longer necessary to represent this operand as an anon const, since it's just a path expression, and also more importantly to sidestep yet another ICE (rust-lang#137179), which has to do with the existing code breaking an invariant of def-id creation and anon consts. Specifically, we are not allowed to synthesize a def-id for an anon const when that anon const contains expressions with def-ids whose parent is not that anon const. This is somewhat related to rust-lang#130443 (comment), which is also a place in the compiler where synthesizing anon consts leads to def-id parenting issue.
As a side-effect, this consolidates the type checking for inline and global asm, so it allows us to simplify InlineAsmCtxt a bit. It also allows us to delete a bit of hacky code from anon const type_of which was there to detect sym fn operands specifically. This also could be generalized to support const asm operands with types with lifetimes in them. Since we specifically reject these consts today, I'm not going to change the representation of those consts (but they'd just be turned into inline consts).
r? oli-obk -- mostly b/c you're patient and also understand the breadth of the code that this touches, please reassign if you don't want to review this.
Fixes rust-lang#111709 Fixes rust-lang#96304 Fixes rust-lang#137179
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request
…-obk
Give global_asm a fake body to store typeck results, represent sym fn as a hir expr to fix sym fn operands with lifetimes
There are a few intertwined problems with sym fn operands in both inline and global asm macros.
Specifically, unlike other anon consts, they may evaluate to a type with free regions in them without actually having an item-level type annotation to give them a "proper" type. This is in contrast to named constants, which always have an item-level type annotation, or unnamed constants which are constrained by their position (e.g. a const arg in a turbofish, or a const array length).
Today, we infer the type of the operand by looking at the HIR typeck results; however, those results are region-erased, so during borrowck we ICE since we don't expect to encounter erased regions. We can't just fill this type with something like 'static, since we may want to use real (free) regions:
fn foo<'a>() {
asm!("/* ... */", sym bar::<&'a ()>);
}The first idea may be to represent sym fn operands using inline consts instead of anon consts. This makes sense, since inline consts can reference regions from the parent body (like the 'a in the example above). However, this introduces a problem with global_asm!, which doesn't have a parent body; inline consts must be associated with a parent body since they are not a body owner of their own. In rust-lang#116087, I attempted to fix this by using two separate sym operands for global and inline asm. However, this led to a lot of confusion and also some unattractive code duplication.
In this PR, I adjust the lowering of global_asm! so that it's lowered in a "fake" HIR body. This body contains a single expression which is ExprKind::InlineAsm; we don't use this HIR body, but it's used in typeck and borrowck so that we can properly infer and validate the the lifetimes of sym fn operands.
I then adjust the lowering of sym fn to instead be represented with a HIR expression. This is both because it's no longer necessary to represent this operand as an anon const, since it's just a path expression, and also more importantly to sidestep yet another ICE (rust-lang#137179), which has to do with the existing code breaking an invariant of def-id creation and anon consts. Specifically, we are not allowed to synthesize a def-id for an anon const when that anon const contains expressions with def-ids whose parent is not that anon const. This is somewhat related to rust-lang#130443 (comment), which is also a place in the compiler where synthesizing anon consts leads to def-id parenting issue.
As a side-effect, this consolidates the type checking for inline and global asm, so it allows us to simplify InlineAsmCtxt a bit. It also allows us to delete a bit of hacky code from anon const type_of which was there to detect sym fn operands specifically. This also could be generalized to support const asm operands with types with lifetimes in them. Since we specifically reject these consts today, I'm not going to change the representation of those consts (but they'd just be turned into inline consts).
r? oli-obk -- mostly b/c you're patient and also understand the breadth of the code that this touches, please reassign if you don't want to review this.
Fixes rust-lang#111709 Fixes rust-lang#96304 Fixes rust-lang#137179
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request
Rollup merge of rust-lang#137180 - compiler-errors:sym-regions, r=oli-obk
Give global_asm a fake body to store typeck results, represent sym fn as a hir expr to fix sym fn operands with lifetimes
There are a few intertwined problems with sym fn operands in both inline and global asm macros.
Specifically, unlike other anon consts, they may evaluate to a type with free regions in them without actually having an item-level type annotation to give them a "proper" type. This is in contrast to named constants, which always have an item-level type annotation, or unnamed constants which are constrained by their position (e.g. a const arg in a turbofish, or a const array length).
Today, we infer the type of the operand by looking at the HIR typeck results; however, those results are region-erased, so during borrowck we ICE since we don't expect to encounter erased regions. We can't just fill this type with something like 'static, since we may want to use real (free) regions:
fn foo<'a>() {
asm!("/* ... */", sym bar::<&'a ()>);
}The first idea may be to represent sym fn operands using inline consts instead of anon consts. This makes sense, since inline consts can reference regions from the parent body (like the 'a in the example above). However, this introduces a problem with global_asm!, which doesn't have a parent body; inline consts must be associated with a parent body since they are not a body owner of their own. In rust-lang#116087, I attempted to fix this by using two separate sym operands for global and inline asm. However, this led to a lot of confusion and also some unattractive code duplication.
In this PR, I adjust the lowering of global_asm! so that it's lowered in a "fake" HIR body. This body contains a single expression which is ExprKind::InlineAsm; we don't use this HIR body, but it's used in typeck and borrowck so that we can properly infer and validate the the lifetimes of sym fn operands.
I then adjust the lowering of sym fn to instead be represented with a HIR expression. This is both because it's no longer necessary to represent this operand as an anon const, since it's just a path expression, and also more importantly to sidestep yet another ICE (rust-lang#137179), which has to do with the existing code breaking an invariant of def-id creation and anon consts. Specifically, we are not allowed to synthesize a def-id for an anon const when that anon const contains expressions with def-ids whose parent is not that anon const. This is somewhat related to rust-lang#130443 (comment), which is also a place in the compiler where synthesizing anon consts leads to def-id parenting issue.
As a side-effect, this consolidates the type checking for inline and global asm, so it allows us to simplify InlineAsmCtxt a bit. It also allows us to delete a bit of hacky code from anon const type_of which was there to detect sym fn operands specifically. This also could be generalized to support const asm operands with types with lifetimes in them. Since we specifically reject these consts today, I'm not going to change the representation of those consts (but they'd just be turned into inline consts).
r? oli-obk -- mostly b/c you're patient and also understand the breadth of the code that this touches, please reassign if you don't want to review this.
Fixes rust-lang#111709 Fixes rust-lang#96304 Fixes rust-lang#137179
RalfJung pushed a commit to RalfJung/miri that referenced this pull request
Give global_asm a fake body to store typeck results, represent sym fn as a hir expr to fix sym fn operands with lifetimes
There are a few intertwined problems with sym fn operands in both inline and global asm macros.
Specifically, unlike other anon consts, they may evaluate to a type with free regions in them without actually having an item-level type annotation to give them a "proper" type. This is in contrast to named constants, which always have an item-level type annotation, or unnamed constants which are constrained by their position (e.g. a const arg in a turbofish, or a const array length).
Today, we infer the type of the operand by looking at the HIR typeck results; however, those results are region-erased, so during borrowck we ICE since we don't expect to encounter erased regions. We can't just fill this type with something like 'static, since we may want to use real (free) regions:
fn foo<'a>() {
asm!("/* ... */", sym bar::<&'a ()>);
}The first idea may be to represent sym fn operands using inline consts instead of anon consts. This makes sense, since inline consts can reference regions from the parent body (like the 'a in the example above). However, this introduces a problem with global_asm!, which doesn't have a parent body; inline consts must be associated with a parent body since they are not a body owner of their own. In #116087, I attempted to fix this by using two separate sym operands for global and inline asm. However, this led to a lot of confusion and also some unattractive code duplication.
In this PR, I adjust the lowering of global_asm! so that it's lowered in a "fake" HIR body. This body contains a single expression which is ExprKind::InlineAsm; we don't use this HIR body, but it's used in typeck and borrowck so that we can properly infer and validate the the lifetimes of sym fn operands.
I then adjust the lowering of sym fn to instead be represented with a HIR expression. This is both because it's no longer necessary to represent this operand as an anon const, since it's just a path expression, and also more importantly to sidestep yet another ICE (rust-lang/rust#137179), which has to do with the existing code breaking an invariant of def-id creation and anon consts. Specifically, we are not allowed to synthesize a def-id for an anon const when that anon const contains expressions with def-ids whose parent is not that anon const. This is somewhat related to rust-lang/rust#130443 (comment), which is also a place in the compiler where synthesizing anon consts leads to def-id parenting issue.
As a side-effect, this consolidates the type checking for inline and global asm, so it allows us to simplify InlineAsmCtxt a bit. It also allows us to delete a bit of hacky code from anon const type_of which was there to detect sym fn operands specifically. This also could be generalized to support const asm operands with types with lifetimes in them. Since we specifically reject these consts today, I'm not going to change the representation of those consts (but they'd just be turned into inline consts).
r? oli-obk -- mostly b/c you're patient and also understand the breadth of the code that this touches, please reassign if you don't want to review this.
Fixes #111709 Fixes #96304 Fixes #137179
bjorn3 pushed a commit to rust-lang/rustc_codegen_cranelift that referenced this pull request
Give global_asm a fake body to store typeck results, represent sym fn as a hir expr to fix sym fn operands with lifetimes
There are a few intertwined problems with sym fn operands in both inline and global asm macros.
Specifically, unlike other anon consts, they may evaluate to a type with free regions in them without actually having an item-level type annotation to give them a "proper" type. This is in contrast to named constants, which always have an item-level type annotation, or unnamed constants which are constrained by their position (e.g. a const arg in a turbofish, or a const array length).
Today, we infer the type of the operand by looking at the HIR typeck results; however, those results are region-erased, so during borrowck we ICE since we don't expect to encounter erased regions. We can't just fill this type with something like 'static, since we may want to use real (free) regions:
fn foo<'a>() {
asm!("/* ... */", sym bar::<&'a ()>);
}The first idea may be to represent sym fn operands using inline consts instead of anon consts. This makes sense, since inline consts can reference regions from the parent body (like the 'a in the example above). However, this introduces a problem with global_asm!, which doesn't have a parent body; inline consts must be associated with a parent body since they are not a body owner of their own. In #116087, I attempted to fix this by using two separate sym operands for global and inline asm. However, this led to a lot of confusion and also some unattractive code duplication.
In this PR, I adjust the lowering of global_asm! so that it's lowered in a "fake" HIR body. This body contains a single expression which is ExprKind::InlineAsm; we don't use this HIR body, but it's used in typeck and borrowck so that we can properly infer and validate the the lifetimes of sym fn operands.
I then adjust the lowering of sym fn to instead be represented with a HIR expression. This is both because it's no longer necessary to represent this operand as an anon const, since it's just a path expression, and also more importantly to sidestep yet another ICE (rust-lang/rust#137179), which has to do with the existing code breaking an invariant of def-id creation and anon consts. Specifically, we are not allowed to synthesize a def-id for an anon const when that anon const contains expressions with def-ids whose parent is not that anon const. This is somewhat related to rust-lang/rust#130443 (comment), which is also a place in the compiler where synthesizing anon consts leads to def-id parenting issue.
As a side-effect, this consolidates the type checking for inline and global asm, so it allows us to simplify InlineAsmCtxt a bit. It also allows us to delete a bit of hacky code from anon const type_of which was there to detect sym fn operands specifically. This also could be generalized to support const asm operands with types with lifetimes in them. Since we specifically reject these consts today, I'm not going to change the representation of those consts (but they'd just be turned into inline consts).
r? oli-obk -- mostly b/c you're patient and also understand the breadth of the code that this touches, please reassign if you don't want to review this.
Fixes #111709 Fixes #96304 Fixes #137179
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request
Give global_asm a fake body to store typeck results, represent sym fn as a hir expr to fix sym fn operands with lifetimes
There are a few intertwined problems with sym fn operands in both inline and global asm macros.
Specifically, unlike other anon consts, they may evaluate to a type with free regions in them without actually having an item-level type annotation to give them a "proper" type. This is in contrast to named constants, which always have an item-level type annotation, or unnamed constants which are constrained by their position (e.g. a const arg in a turbofish, or a const array length).
Today, we infer the type of the operand by looking at the HIR typeck results; however, those results are region-erased, so during borrowck we ICE since we don't expect to encounter erased regions. We can't just fill this type with something like 'static, since we may want to use real (free) regions:
fn foo<'a>() {
asm!("/* ... */", sym bar::<&'a ()>);
}The first idea may be to represent sym fn operands using inline consts instead of anon consts. This makes sense, since inline consts can reference regions from the parent body (like the 'a in the example above). However, this introduces a problem with global_asm!, which doesn't have a parent body; inline consts must be associated with a parent body since they are not a body owner of their own. In #116087, I attempted to fix this by using two separate sym operands for global and inline asm. However, this led to a lot of confusion and also some unattractive code duplication.
In this PR, I adjust the lowering of global_asm! so that it's lowered in a "fake" HIR body. This body contains a single expression which is ExprKind::InlineAsm; we don't use this HIR body, but it's used in typeck and borrowck so that we can properly infer and validate the the lifetimes of sym fn operands.
I then adjust the lowering of sym fn to instead be represented with a HIR expression. This is both because it's no longer necessary to represent this operand as an anon const, since it's just a path expression, and also more importantly to sidestep yet another ICE (rust-lang/rust#137179), which has to do with the existing code breaking an invariant of def-id creation and anon consts. Specifically, we are not allowed to synthesize a def-id for an anon const when that anon const contains expressions with def-ids whose parent is not that anon const. This is somewhat related to rust-lang/rust#130443 (comment), which is also a place in the compiler where synthesizing anon consts leads to def-id parenting issue.
As a side-effect, this consolidates the type checking for inline and global asm, so it allows us to simplify InlineAsmCtxt a bit. It also allows us to delete a bit of hacky code from anon const type_of which was there to detect sym fn operands specifically. This also could be generalized to support const asm operands with types with lifetimes in them. Since we specifically reject these consts today, I'm not going to change the representation of those consts (but they'd just be turned into inline consts).
r? oli-obk -- mostly b/c you're patient and also understand the breadth of the code that this touches, please reassign if you don't want to review this.
Fixes #111709 Fixes #96304 Fixes #137179
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request
…lds, r=jieyouxu
Make sure to propagate result from visit_expr_fields
We weren't propagating the ControlFlow::Break out of a struct field, which means that the solution implemented in rust-lang#130443 didn't work for nested fields.
Fixes rust-lang#142525.
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request
…lds, r=jieyouxu
Make sure to propagate result from visit_expr_fields
We weren't propagating the ControlFlow::Break out of a struct field, which means that the solution implemented in rust-lang#130443 didn't work for nested fields.
Fixes rust-lang#142525.
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request
…lds, r=jieyouxu
Make sure to propagate result from visit_expr_fields
We weren't propagating the ControlFlow::Break out of a struct field, which means that the solution implemented in rust-lang#130443 didn't work for nested fields.
Fixes rust-lang#142525.
rust-timer added a commit that referenced this pull request
Rollup merge of #142587 - compiler-errors:try-visit-expr-fields, r=jieyouxu
Make sure to propagate result from visit_expr_fields
We weren't propagating the ControlFlow::Break out of a struct field, which means that the solution implemented in #130443 didn't work for nested fields.
Fixes #142525.
This was referenced
Sep 11, 2025