Add more tests for the offset_of macro #111665

est31 · 2023-05-17T03:18:41Z

Implements what I suggested in the tracking issue, plus some further improvements:

ensuring that offset_of!(Self, ...) works iff inside an impl block
ensuring that the output type is usize and doesn't coerce. this can be changed in the future, but if it is done, it should be a conscious decision
improving the privacy checking test
ensuring that generics don't let you escape the unsized check

WaffleLapkin · 2023-05-17T08:15:28Z

tests/ui/offset-of/offset-of-self.rs

Could you also add a test for privacy with Self? There recently were some issues with it, so a test that Self doesn't allow to refer to private fields would be nice.

Something like

mod module { pub struct Named { v: u8 } } trait Trait { fn f() -> usize {} } impl Trait for module::Named { fn f() -> usize { offset_of!(Self, v) //~ error: field is private or whatever } }

(and similarly for a tuple struct)

est31 · 2023-05-17T09:28:19Z

@rustbot ready

est31 · 2023-05-17T10:24:11Z

error: internal compiler error: compiler/rustc_hir_typeck/src/writeback.rs:697:17: writeback: `Delta<dyn Trait>` has inference variables
  --> fake-test-src-base/offset-of/offset-of-dst-field.rs:44:5
   |
LL |     offset_of!(Delta<dyn Trait>, z); //~ ERROR the size for values of type
   |
   = note: this error: internal compiler error originates in the macro `offset_of` (in Nightly builds, run with -Z macro-backtrace for more info)

Hmm this is interesting. It's also interesting that I am not getting this ICE locally. Are there some checks running in CI that aren't running locally?

WaffleLapkin · 2023-05-17T10:35:50Z

@est31 do you have debug assertions enabled? this is the check:

rust/compiler/rustc_hir_typeck/src/writeback.rs

Lines 696 to 702 in c2ccc85

    
           if cfg!(debug_assertions) && container.has_infer() { 
        
               span_bug!( 
        
                   hir_id.to_span(self.fcx.tcx), 
        
                   "writeback: `{:?}` has inference variables", 
        
                   container 
        
               ); 
        
           };

est31 · 2023-05-17T10:44:35Z

@WaffleLapkin I haven't. So I guess this is a bug then if you enable debug assertions in the compiler. Good that we are doing these tests 😆

est31 · 2023-05-17T11:02:36Z

Alright it still ICEs after having rebased this PR onto #111661 , so it means that one didn't fix it. I also can reproduce it locally if I enable debug assertions. Will remove the particular test from this PR and then file a separate issue.

est31 · 2023-05-17T11:10:41Z

I've changed it to use Extern instead of dyn Trait. If you use [u8] then the error is deduplicated with the one about Alpha. I've also filed #111678.

Should be ready for review.

WaffleLapkin · 2023-05-18T10:23:47Z

tests/ui/offset-of/offset-of-self.rs

+    }
+    impl super::n::T {
+        fn v_offs_self() -> usize {
+            offset_of!(Self, v) //~ ERROR field `v` of struct


Suggested change

offset_of!(Self, v) //~ ERROR field `v` of struct

offset_of!(Self, v) //~ ERROR field `v` of struct `T` is private

WaffleLapkin · 2023-05-18T10:25:33Z

tests/ui/offset-of/offset-of-dst-field.rs

 fn main() {
    offset_of!(Alpha, z); //~ ERROR the size for values of type
    offset_of!(Beta, z); //~ ERROR the size for values of type
    offset_of!(Gamma, z); //~ ERROR the size for values of type
 }
+
+fn delta() {
+    offset_of!(Delta<u8>, z); // compiles fine


Maybe we should move fine-compiling parts to separate files, to ensure they really compile? (besides, I think there already are test that have the same compiling code, so maybe this and generic_with_sized_type are just redundant)

~~The only other tests with generics I could find were the one with Self that are added by this PR as well as the test added in #111661.~~ edit: nvm, there are other tests, e.g. tests/ui/lint/dead-code/offset-of-correct-param-env.rs or tests/ui/lint/dead-code/offset-of.rs.

I will move the passing tests though, at least the ones in this file.

* ensuring that offset_of!(Self, ...) works iff inside an impl block * ensuring that the output type is usize and doesn't coerce. this can be changed in the future, but if it is done, it should be a conscious descision * improving the privacy checking test * ensuring that generics don't let you escape the unsized check

est31 · 2023-05-18T11:16:36Z

@rustbot ready

WaffleLapkin

Thanks!

WaffleLapkin · 2023-05-18T14:19:00Z

@bors r+ rollup

bors · 2023-05-18T14:19:02Z

📌 Commit 30c0e4e has been approved by WaffleLapkin

It is now in the queue for this repository.

Add more tests for the offset_of macro Implements what I [suggested in the tracking issue](rust-lang#106655 (comment)), plus some further improvements: * ensuring that offset_of!(Self, ...) works iff inside an impl block * ensuring that the output type is usize and doesn't coerce. this can be changed in the future, but if it is done, it should be a conscious decision * improving the privacy checking test * ensuring that generics don't let you escape the unsized check r? `@WaffleLapkin`

Add more tests for the offset_of macro Implements what I [suggested in the tracking issue](rust-lang#106655 (comment)), plus some further improvements: * ensuring that offset_of!(Self, ...) works iff inside an impl block * ensuring that the output type is usize and doesn't coerce. this can be changed in the future, but if it is done, it should be a conscious decision * improving the privacy checking test * ensuring that generics don't let you escape the unsized check r? ``@WaffleLapkin``

Add more tests for the offset_of macro Implements what I [suggested in the tracking issue](rust-lang#106655 (comment)), plus some further improvements: * ensuring that offset_of!(Self, ...) works iff inside an impl block * ensuring that the output type is usize and doesn't coerce. this can be changed in the future, but if it is done, it should be a conscious decision * improving the privacy checking test * ensuring that generics don't let you escape the unsized check r? ```@WaffleLapkin```

Add more tests for the offset_of macro Implements what I [suggested in the tracking issue](rust-lang#106655 (comment)), plus some further improvements: * ensuring that offset_of!(Self, ...) works iff inside an impl block * ensuring that the output type is usize and doesn't coerce. this can be changed in the future, but if it is done, it should be a conscious decision * improving the privacy checking test * ensuring that generics don't let you escape the unsized check r? ````@WaffleLapkin````

Rollup of 10 pull requests Successful merges: - rust-lang#111491 (Dont check `must_use` on nested `impl Future` from fn) - rust-lang#111606 (very minor cleanups) - rust-lang#111619 (Add timings for MIR passes to profiling report) - rust-lang#111652 (Better diagnostic for `use Self::..`) - rust-lang#111665 (Add more tests for the offset_of macro) - rust-lang#111708 (Give a more useful location for where a span_bug was delayed) - rust-lang#111715 (Fix doc comment for `ConstParamTy` derive) - rust-lang#111723 (style: do not overwrite obligations) - rust-lang#111743 (Improve cgu merging debug output) - rust-lang#111762 (fix: emit error when fragment is `MethodReceiverExpr` and items is empty) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned WaffleLapkin May 17, 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 May 17, 2023

est31 force-pushed the offset_of_tests branch from ed84277 to d4be511 Compare May 17, 2023 03:53

est31 mentioned this pull request May 17, 2023

Tracking Issue for #![feature(offset_of)] #106655

Closed

7 tasks

WaffleLapkin reviewed May 17, 2023

View reviewed changes

WaffleLapkin 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 May 17, 2023

est31 force-pushed the offset_of_tests branch from d4be511 to d8ac2af Compare May 17, 2023 09:01

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 May 17, 2023

est31 force-pushed the offset_of_tests branch 2 times, most recently from 480d06c to f100c3c Compare May 17, 2023 09:45

est31 changed the title ~~Add more tests for offset_of macro~~ Add more tests for the offset_of macro May 17, 2023

This comment has been minimized.

Sign in to view

est31 force-pushed the offset_of_tests branch from f100c3c to 7e14b4f Compare May 17, 2023 10:43

This comment has been minimized.

Sign in to view

est31 mentioned this pull request May 17, 2023

ICE: has inference variables for offset_of with Box<dyn Trait> #111678

Closed

est31 force-pushed the offset_of_tests branch from 7e14b4f to dd7c128 Compare May 17, 2023 11:09

lukas-code mentioned this pull request May 17, 2023

don't skip inference for type in offset_of! #111696

Merged

WaffleLapkin reviewed May 18, 2023

View reviewed changes

WaffleLapkin 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 May 18, 2023

est31 force-pushed the offset_of_tests branch from dd7c128 to 412105d Compare May 18, 2023 11:14

est31 force-pushed the offset_of_tests branch from 412105d to 30c0e4e Compare May 18, 2023 11:16

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 May 18, 2023

WaffleLapkin approved these changes May 18, 2023

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 May 18, 2023

Dylan-DPC mentioned this pull request May 18, 2023

Rollup of 6 pull requests #111732

Closed

matthiaskrgr mentioned this pull request May 19, 2023

Rollup of 8 pull requests #111750

Closed

GuillaumeGomez mentioned this pull request May 19, 2023

Rollup of 10 pull requests #111760

Closed

GuillaumeGomez mentioned this pull request May 19, 2023

Rollup of 10 pull requests #111767

Closed

Dylan-DPC mentioned this pull request May 20, 2023

Rollup of 10 pull requests #111778

Merged

bors merged commit e892e32 into rust-lang:master May 20, 2023

rustbot added this to the 1.71.0 milestone May 20, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add more tests for the offset_of macro #111665

Add more tests for the offset_of macro #111665

est31 commented May 17, 2023 •

edited

Loading

WaffleLapkin May 17, 2023

est31 commented May 17, 2023

This comment has been minimized.

est31 commented May 17, 2023

WaffleLapkin commented May 17, 2023

est31 commented May 17, 2023

This comment has been minimized.

est31 commented May 17, 2023

est31 commented May 17, 2023

WaffleLapkin May 18, 2023

WaffleLapkin May 18, 2023

est31 May 18, 2023 •

edited

Loading

est31 commented May 18, 2023

WaffleLapkin left a comment

WaffleLapkin commented May 18, 2023

bors commented May 18, 2023

	offset_of!(Self, v) //~ ERROR field `v` of struct
	offset_of!(Self, v) //~ ERROR field `v` of struct `T` is private

Add more tests for the offset_of macro #111665

Add more tests for the offset_of macro #111665

Conversation

est31 commented May 17, 2023 • edited Loading

WaffleLapkin May 17, 2023

Choose a reason for hiding this comment

est31 commented May 17, 2023

This comment has been minimized.

est31 commented May 17, 2023

WaffleLapkin commented May 17, 2023

est31 commented May 17, 2023

This comment has been minimized.

est31 commented May 17, 2023

est31 commented May 17, 2023

WaffleLapkin May 18, 2023

Choose a reason for hiding this comment

WaffleLapkin May 18, 2023

Choose a reason for hiding this comment

est31 May 18, 2023 • edited Loading

Choose a reason for hiding this comment

est31 commented May 18, 2023

WaffleLapkin left a comment

Choose a reason for hiding this comment

WaffleLapkin commented May 18, 2023

bors commented May 18, 2023

est31 commented May 17, 2023 •

edited

Loading

est31 May 18, 2023 •

edited

Loading