abi: add AddressSpace field to Primitive::Pointer #107248

erikdesjardins · 2023-01-24T05:10:42Z

...and remove it from PointeeInfo, which isn't meant for this.

There are still various places (marked with FIXMEs) that assume all pointers
have the same size and alignment. Fixing this requires parsing non-default
address spaces in the data layout string (and various other changes),
which will be done in a followup.
(That is, if it's actually worth it to support multiple different pointer sizes.
There is a lot of code that would be affected by that.)

Fixes #106367

r? @oli-obk
cc @Patryk27

there were fixmes for this already i am about to remove is_ptr (since callers need to properly distinguish between pointers in different address spaces), so might as well do this at the same time

...and remove it from `PointeeInfo`, which isn't meant for this. There are still various places (marked with FIXMEs) that assume all pointers have the same size and alignment. Fixing this requires parsing non-default address spaces in the data layout string, which will be done in a followup.

rustbot · 2023-01-24T05:10:51Z

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

oli-obk

looks like that snippet about GlobalAlloc is only ever used once. A bit surprising, but maybe we'll see more of it if we end up teaching const eval about address spaces (it already kind of has some of them implicitly)

compiler/rustc_codegen_gcc/src/consts.rs

oli-obk · 2023-01-24T07:55:17Z

@bors r+

bors · 2023-01-24T07:55:19Z

📌 Commit 009192b has been approved by oli-obk

It is now in the queue for this repository.

rustbot · 2023-01-25T06:46:39Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

oli-obk · 2023-01-25T07:46:09Z

@bors r+

bors · 2023-01-25T07:46:11Z

📌 Commit adc1890 has been approved by oli-obk

It is now in the queue for this repository.

abi: add AddressSpace field to Primitive::Pointer ...and remove it from `PointeeInfo`, which isn't meant for this. There are still various places (marked with FIXMEs) that assume all pointers have the same size and alignment. Fixing this requires parsing non-default address spaces in the data layout string (and various other changes), which will be done in a followup. (That is, if it's actually worth it to support multiple different pointer sizes. There is a lot of code that would be affected by that.) Fixes rust-lang#106367 r? `@oli-obk` cc `@Patryk27`

…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#106407 (Improve proc macro attribute diagnostics) - rust-lang#106960 (Teach parser to understand fake anonymous enum syntax) - rust-lang#107085 (Custom MIR: Support binary and unary operations) - rust-lang#107086 (Print PID holding bootstrap build lock on Linux) - rust-lang#107175 (Fix escaping inference var ICE in `point_at_expr_source_of_inferred_type`) - rust-lang#107204 (suggest qualifying bare associated constants) - rust-lang#107248 (abi: add AddressSpace field to Primitive::Pointer ) - rust-lang#107272 (Implement ObjectSafe and WF in the new solver) - rust-lang#107285 (Implement `Generator` and `Future` in the new solver) - rust-lang#107286 (ICE in new solver if we see an inference variable) - rust-lang#107313 (Add Style Team Triagebot config) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

RalfJung · 2023-01-29T21:01:33Z

compiler/rustc_abi/src/lib.rs

@@ -1468,7 +1461,6 @@ pub struct PointeeInfo {
    pub size: Size,
    pub align: Align,
    pub safe: Option<PointerKind>,
-    pub address_space: AddressSpace,


Awesome, thanks a ton. :)
Note to self: add a comment to PointeeInfo stating that this is for optimization purposes only and safe to ignore by backends (as suggested by @eddyb)

PointeeInfo is advisory only rust-lang#107248 fixed PointeeInfo being used in ways that don't actually work. Hopefully this comments helps avoid such issues in the future. Cc `@eddyb`

PointeeInfo is advisory only rust-lang#107248 fixed PointeeInfo being used in ways that don't actually work. Hopefully this comments helps avoid such issues in the future. Cc ``@eddyb``

…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#106407 (Improve proc macro attribute diagnostics) - rust-lang#106960 (Teach parser to understand fake anonymous enum syntax) - rust-lang#107085 (Custom MIR: Support binary and unary operations) - rust-lang#107086 (Print PID holding bootstrap build lock on Linux) - rust-lang#107175 (Fix escaping inference var ICE in `point_at_expr_source_of_inferred_type`) - rust-lang#107204 (suggest qualifying bare associated constants) - rust-lang#107248 (abi: add AddressSpace field to Primitive::Pointer ) - rust-lang#107272 (Implement ObjectSafe and WF in the new solver) - rust-lang#107285 (Implement `Generator` and `Future` in the new solver) - rust-lang#107286 (ICE in new solver if we see an inference variable) - rust-lang#107313 (Add Style Team Triagebot config) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

(GeneratorWitnessMIR) Compute generator saved locals on MIR rust-lang/rust#101692 (ParamEnv) InstCombine away intrinsic validity assertions rust-lang/rust#105582 (Primitive::Pointer) abi: add AddressSpace field to Primitive::Pointer rust-lang/rust#107248

erikdesjardins added 2 commits January 22, 2023 21:02

rustc_abi: remove Primitive::{is_float,is_int}

96f8f99

there were fixmes for this already i am about to remove is_ptr (since callers need to properly distinguish between pointers in different address spaces), so might as well do this at the same time

rustbot assigned oli-obk Jan 24, 2023

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 Jan 24, 2023

oli-obk approved these changes Jan 24, 2023

View reviewed changes

compiler/rustc_codegen_gcc/src/consts.rs Outdated Show resolved Hide resolved

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 24, 2023

create and use GlobalAlloc::address_space

adc1890

This was referenced Jan 25, 2023

Rollup of 9 pull requests #107311

Closed

Rollup of 11 pull requests #107314

Merged

bors merged commit a8b5e5d into rust-lang:master Jan 26, 2023

rustbot added this to the 1.69.0 milestone Jan 26, 2023

erikdesjardins deleted the addrspace branch January 26, 2023 18:27

RalfJung reviewed Jan 29, 2023

View reviewed changes

RalfJung mentioned this pull request Jan 31, 2023

PointeeInfo is advisory only #107525

Merged

tedinski mentioned this pull request Feb 3, 2023

Update Rust toolchain to nightly-2023-02-03 model-checking/kani#2184

Closed

4 tasks

qinheping mentioned this pull request Mar 9, 2023

Upgrade Rust toolchain to nightly-2023-02-03 model-checking/kani#2291

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

abi: add AddressSpace field to Primitive::Pointer #107248

abi: add AddressSpace field to Primitive::Pointer #107248

erikdesjardins commented Jan 24, 2023

rustbot commented Jan 24, 2023

oli-obk left a comment

oli-obk commented Jan 24, 2023

bors commented Jan 24, 2023

rustbot commented Jan 25, 2023

oli-obk commented Jan 25, 2023

bors commented Jan 25, 2023

RalfJung Jan 29, 2023

abi: add AddressSpace field to Primitive::Pointer #107248

abi: add AddressSpace field to Primitive::Pointer #107248

Conversation

erikdesjardins commented Jan 24, 2023

rustbot commented Jan 24, 2023

oli-obk left a comment

Choose a reason for hiding this comment

oli-obk commented Jan 24, 2023

bors commented Jan 24, 2023

rustbot commented Jan 25, 2023

oli-obk commented Jan 25, 2023

bors commented Jan 25, 2023

RalfJung Jan 29, 2023

Choose a reason for hiding this comment