Modify GenericArg and Term structs to use strict provenance rules #119955

kamalesh0406 · 2024-01-14T05:55:58Z

This is the first PR to solve issue #119217 . In this PR, I have modified the GenericArg struct to use the NonNull struct as the pointer instead of NonZeroUsize. The change were tested by running ./x test compiler/rustc_middle.

Resolves #119217

r? @WaffleLapkin

rustbot · 2024-01-14T05:56:06Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @WaffleLapkin (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

@rustbot author: the review is finished, PR author should check the comments and take action accordingly
@rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

WaffleLapkin

This generally looks good, but I have a few nitpicks :)

WaffleLapkin · 2024-01-14T10:36:22Z

compiler/rustc_middle/src/ty/generic_args.rs

@@ -123,20 +142,22 @@ impl<'tcx> From<ty::Term<'tcx>> for GenericArg<'tcx> {
 impl<'tcx> GenericArg<'tcx> {
    #[inline]
    pub fn unpack(self) -> GenericArgKind<'tcx> {
-        let ptr = self.ptr.get();
+        let ptr_without_tag = unsafe {


I think the name ptr is fine, no need to specify "without tag"

WaffleLapkin · 2024-01-14T10:37:06Z

compiler/rustc_middle/src/ty/generic_args.rs

@@ -123,20 +142,22 @@ impl<'tcx> From<ty::Term<'tcx>> for GenericArg<'tcx> {
 impl<'tcx> GenericArg<'tcx> {
    #[inline]
    pub fn unpack(self) -> GenericArgKind<'tcx> {
-        let ptr = self.ptr.get();
+        let ptr_without_tag = unsafe {
+            self.ptr.map_addr(|addr| NonZeroUsize::new_unchecked(addr.get() & !TAG_MASK)).as_ptr()


Suggested change

self.ptr.map_addr(|addr| NonZeroUsize::new_unchecked(addr.get() & !TAG_MASK)).as_ptr()

self.ptr.map_addr(|addr| NonZeroUsize::new_unchecked(addr.get() & !TAG_MASK))

no need to leave NonNull (see below)

WaffleLapkin · 2024-01-14T10:38:59Z

compiler/rustc_middle/src/ty/generic_args.rs

                REGION_TAG => GenericArgKind::Lifetime(ty::Region(Interned::new_unchecked(
-                    &*((ptr & !TAG_MASK) as *const ty::RegionKind<'tcx>),
+                    &*(ptr_without_tag as *const ty::RegionKind<'tcx>),


Suggested change

&*(ptr_without_tag as *const ty::RegionKind<'tcx>),

ptr.cast::<ty::RegionKind<'tcx>>().as_ref(),

and similarly for others

WaffleLapkin · 2024-01-14T10:42:16Z

I've marked this as S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. , once this is ready for review, please use @rustbot review (learn more about rustbot commands).

kamalesh0406 · 2024-01-14T14:12:17Z

@rustbot review

rustbot · 2024-01-15T15:30:58Z

Could not assign reviewer from: WaffleLapkin.
User(s) WaffleLapkin are either the PR author, already assigned, or on vacation, and there are no other candidates.
Use r? to specify someone else to assign.

WaffleLapkin · 2024-01-15T16:09:53Z

compiler/rustc_middle/src/ty/generic_args.rs

            }
        };

-        GenericArg { ptr: unsafe { NonZeroUsize::new_unchecked(ptr | tag) }, marker: PhantomData }
+        GenericArg {
+            ptr: unsafe { ptr.map_addr(|addr| NonZeroUsize::new_unchecked(addr.get() | tag)) },


There is a BitOr<usize> impl for NonZeroUsize, so you can just

Suggested change

ptr: unsafe { ptr.map_addr(|addr| NonZeroUsize::new_unchecked(addr.get() | tag)) },

ptr: ptr.map_addr(|addr| addr | tag),

WaffleLapkin · 2024-01-15T16:11:56Z

compiler/rustc_middle/src/ty/generic_args.rs

                REGION_TAG => GenericArgKind::Lifetime(ty::Region(Interned::new_unchecked(
-                    &*((ptr & !TAG_MASK) as *const ty::RegionKind<'tcx>),
+                    &*(ptr.cast::<ty::RegionKind<'tcx>>().as_ref()),


I don't think residing here and later is needed

Suggested change

&*(ptr.cast::<ty::RegionKind<'tcx>>().as_ref()),

ptr.cast::<ty::RegionKind<'tcx>>().as_ref()

WaffleLapkin · 2024-01-15T16:14:02Z

compiler/rustc_middle/src/ty/mod.rs

            }
        };

-        Term { ptr: unsafe { NonZeroUsize::new_unchecked(ptr | tag) }, marker: PhantomData }
+        Term {
+            ptr: unsafe { ptr.map_addr(|addr| NonZeroUsize::new_unchecked(addr.get() | tag)) },


Suggested change

ptr: unsafe { ptr.map_addr(|addr| NonZeroUsize::new_unchecked(addr.get() | tag)) },

ptr: ptr.map_addr(|addr| addr | tag),

kamalesh0406 · 2024-01-15T17:14:48Z

@rustbot review

WaffleLapkin · 2024-01-17T00:32:10Z

@bors r+ rollup

bors · 2024-01-17T00:32:13Z

📌 Commit cd90143 has been approved by WaffleLapkin

It is now in the queue for this repository.

kamalesh0406 · 2024-01-18T00:45:03Z

@rustbot review

bors · 2024-01-18T00:45:03Z

📌 Commit dcc13b2 has been approved by WaffleLapkin

It is now in the queue for this repository.

Modify GenericArg and Term structs to use strict provenance rules This is the first PR to solve issue rust-lang#119217 . In this PR, I have modified the GenericArg struct to use the `NonNull` struct as the pointer instead of `NonZeroUsize`. The change were tested by running `./x test compiler/rustc_middle`. Resolves rust-lang#119217 r? `@WaffleLapkin`

Modify GenericArg and Term structs to use strict provenance rules This is the first PR to solve issue rust-lang#119217 . In this PR, I have modified the GenericArg struct to use the `NonNull` struct as the pointer instead of `NonZeroUsize`. The change were tested by running `./x test compiler/rustc_middle`. Resolves rust-lang#119217 r? ``@WaffleLapkin``

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#119172 (Detect `NulInCStr` error earlier.) - rust-lang#119833 (Make tcx optional from StableMIR run macro and extend it to accept closures) - rust-lang#119955 (Modify GenericArg and Term structs to use strict provenance rules) - rust-lang#120021 (don't store const var origins for known vars) - rust-lang#120038 (Don't create a separate "basename" when naming and opening a MIR dump file) - rust-lang#120057 (Don't ICE when deducing future output if other errors already occurred) - rust-lang#120073 (Remove spastorino from users_on_vacation) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2024-01-18T09:33:33Z

@bors r- #120088 (comment)

WaffleLapkin · 2024-01-18T21:17:32Z

@kamalesh0406 please use full paths for DynSend/DynSync, instead of imports to prevent the unused imports failure.

kamalesh0406 · 2024-01-19T04:04:36Z

@rustbot review

WaffleLapkin · 2024-01-24T00:20:15Z

Let's try again
@bors r+ rollup=never

bors · 2024-01-24T00:20:19Z

📌 Commit d0dea83 has been approved by WaffleLapkin

It is now in the queue for this repository.

bors · 2024-01-25T07:23:01Z

⌛ Testing commit d0dea83 with merge d93fecc...

bors · 2024-01-25T09:19:15Z

☀️ Test successful - checks-actions
Approved by: WaffleLapkin
Pushing d93fecc to master...

rust-timer · 2024-01-25T10:35:06Z

Finished benchmarking commit (d93fecc): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	5.5%	[5.5%, 5.5%]	1
Regressions ❌ (secondary)	3.0%	[3.0%, 3.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.6%	[-4.6%, -4.6%]	1
All ❌✅ (primary)	5.5%	[5.5%, 5.5%]	1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 661.843s -> 662.638s (0.12%)
Artifact size: 308.29 MiB -> 308.19 MiB (-0.03%)

rustbot assigned WaffleLapkin Jan 14, 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 Jan 14, 2024

WaffleLapkin requested changes Jan 14, 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 Jan 14, 2024

kamalesh0406 force-pushed the master branch from e08d569 to 6e85fa2 Compare January 14, 2024 14:11

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

kamalesh0406 force-pushed the master branch from 6e85fa2 to 76fcdb3 Compare January 15, 2024 15:30

kamalesh0406 changed the title ~~Modify GenericArg to use NonNull ptr~~ Modify GenericArg and Term structs to use strict provenance rules Jan 15, 2024

kamalesh0406 requested a review from WaffleLapkin January 15, 2024 15:31

This comment has been minimized.

Sign in to view

kamalesh0406 force-pushed the master branch from 76fcdb3 to 5f8f1c4 Compare January 15, 2024 16:00

WaffleLapkin requested changes Jan 15, 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 Jan 15, 2024

kamalesh0406 force-pushed the master branch from 5f8f1c4 to cd90143 Compare January 15, 2024 17:13

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

WaffleLapkin approved these changes Jan 17, 2024

View reviewed changes

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 17, 2024

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 18, 2024

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 18, 2024

WaffleLapkin removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 18, 2024

matthiaskrgr mentioned this pull request Jan 18, 2024

Rollup of 8 pull requests #120087

Closed

matthiaskrgr mentioned this pull request Jan 18, 2024

Rollup of 7 pull requests #120088

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 18, 2024

Modify GenericArg and Term structs to use strict provenance rules

d0dea83

kamalesh0406 force-pushed the master branch from dcc13b2 to d0dea83 Compare January 19, 2024 04:03

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

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, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 25, 2024

bors merged commit d93fecc into rust-lang:master Jan 25, 2024
12 checks passed

rustbot added this to the 1.77.0 milestone Jan 25, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modify GenericArg and Term structs to use strict provenance rules #119955

Modify GenericArg and Term structs to use strict provenance rules #119955

kamalesh0406 commented Jan 14, 2024 •

edited by WaffleLapkin

rustbot commented Jan 14, 2024

WaffleLapkin left a comment

WaffleLapkin Jan 14, 2024

WaffleLapkin Jan 14, 2024

WaffleLapkin Jan 14, 2024

WaffleLapkin commented Jan 14, 2024

kamalesh0406 commented Jan 14, 2024

rustbot commented Jan 15, 2024

This comment has been minimized.

WaffleLapkin Jan 15, 2024

WaffleLapkin Jan 15, 2024

WaffleLapkin Jan 15, 2024

kamalesh0406 commented Jan 15, 2024

WaffleLapkin commented Jan 17, 2024

bors commented Jan 17, 2024

kamalesh0406 commented Jan 18, 2024

bors commented Jan 18, 2024

matthiaskrgr commented Jan 18, 2024

WaffleLapkin commented Jan 18, 2024 •

edited

kamalesh0406 commented Jan 19, 2024

WaffleLapkin commented Jan 24, 2024

bors commented Jan 24, 2024

bors commented Jan 25, 2024

bors commented Jan 25, 2024

rust-timer commented Jan 25, 2024

	self.ptr.map_addr(\|addr\| NonZeroUsize::new_unchecked(addr.get() & !TAG_MASK)).as_ptr()
	self.ptr.map_addr(\|addr\| NonZeroUsize::new_unchecked(addr.get() & !TAG_MASK))

	&(ptr_without_tag as const ty::RegionKind<'tcx>),
	ptr.cast::<ty::RegionKind<'tcx>>().as_ref(),

	ptr: unsafe { ptr.map_addr(\|addr\| NonZeroUsize::new_unchecked(addr.get() \| tag)) },
	ptr: ptr.map_addr(\|addr\| addr \| tag),

	&*(ptr.cast::<ty::RegionKind<'tcx>>().as_ref()),
	ptr.cast::<ty::RegionKind<'tcx>>().as_ref()

Modify GenericArg and Term structs to use strict provenance rules #119955

Modify GenericArg and Term structs to use strict provenance rules #119955

Conversation

kamalesh0406 commented Jan 14, 2024 • edited by WaffleLapkin

rustbot commented Jan 14, 2024

WaffleLapkin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

WaffleLapkin commented Jan 14, 2024

kamalesh0406 commented Jan 14, 2024

rustbot commented Jan 15, 2024

This comment has been minimized.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kamalesh0406 commented Jan 15, 2024

WaffleLapkin commented Jan 17, 2024

bors commented Jan 17, 2024

kamalesh0406 commented Jan 18, 2024

bors commented Jan 18, 2024

matthiaskrgr commented Jan 18, 2024

WaffleLapkin commented Jan 18, 2024 • edited

kamalesh0406 commented Jan 19, 2024

WaffleLapkin commented Jan 24, 2024

bors commented Jan 24, 2024

bors commented Jan 25, 2024

bors commented Jan 25, 2024

rust-timer commented Jan 25, 2024

Overall result: no relevant changes - no action needed

kamalesh0406 commented Jan 14, 2024 •

edited by WaffleLapkin

WaffleLapkin commented Jan 18, 2024 •

edited