Add Span to various smir types #116288

ouz-a · 2023-09-30T14:20:44Z

Had to make few extra changes to few structs to attach spans to them.

r? @oli-obk

rustbot · 2023-09-30T14:20:54Z

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

spastorino · 2023-10-03T19:03:09Z

compiler/rustc_smir/src/rustc_smir/mod.rs

+ assign.0.stable(tables),
+ assign.1.stable(tables),
+ ),
+ span: self.source_info.span.stable(tables),


I'd do let span = self.source_info.span.stable(tables); at the top and then just do span, here.

spastorino · 2023-10-03T19:03:40Z

compiler/rustc_smir/src/rustc_smir/mod.rs

- otherwise: targets.otherwise().as_usize(),
+ Goto { target } => Terminator {
+ kind: TerminatorKind::Goto { target: target.as_usize() },
+ span: self.source_info.span.stable(tables),


Same here, move the span assignment outside the match.

spastorino · 2023-10-03T19:04:18Z

This looks good to me, modulo my tiny nit.

ouz-a · 2023-10-03T20:25:44Z

This looks good to me, modulo my tiny nit.

well code looks way cleaner now, thanks!

spastorino · 2023-10-04T13:25:16Z

Another thing that I was thinking that didn't realize yesterday, why don't we implement stable for kind?. Then I think you won't even need this span binding and code would likely be even cleaner.

ouz-a · 2023-10-04T20:51:00Z

Another thing that I was thinking that didn't realize yesterday, why don't we implement stable for kind?. Then I think you won't even need this span binding and code would likely be even cleaner.

That could also work, and indeed it will make the code cleaner but I think this will print out nicer Spans, and will make accessing spans easier, for parsing stuff in the future(if we do something like that).

spastorino · 2023-10-04T21:58:28Z

@ouz-a unsure if you've followed what I've said or if I'm missing something :). What I meant to say is equivalent (unless I'm missing something), you can just go for instance from mir::StatementKind to stable_mir::mir::StatementKind and those don't hold any span.

You would end with code like ...

Statement {
    kind: self.kind.stable(tables),
    span: self.source_info.span.stable(tables),
}

And adding the StatementKind thing.

ouz-a · 2023-10-05T08:14:33Z

@ouz-a unsure if you've followed what I've said or if I'm missing something :). What I meant to say is equivalent (unless I'm missing something), you can just go for instance from mir::StatementKind to stable_mir::mir::StatementKind and those don't hold any span.

You would end with code like ...
Statement {
    kind: self.kind.stable(tables),
    span: self.source_info.span.stable(tables),
}
And adding the StatementKind thing.

Oh I misread your message, I read that as implementing Span for Kinds, (it was late here when I read it 🤣 ) yeah your suggestion is right, I added it on last commit.

spastorino · 2023-10-05T13:50:30Z

@bors r rollup

bors · 2023-10-05T13:50:32Z

📌 Commit a49138e has been approved by spastorino

It is now in the queue for this repository.

Add Span to various smir types Had to make few extra changes to few structs to attach spans to them. r? `@oli-obk`

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#116220 (stabilize `Option::as_`(`mut_`)`slice`) - rust-lang#116288 (Add Span to various smir types) - rust-lang#116415 (Move subtyper below reveal_all and change reveal_all) - rust-lang#116428 (Add a note to duplicate diagnostics) - rust-lang#116452 (Do not assert that hidden types don't have erased regions.) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#116288 - ouz-a:smir_spans, r=spastorino Add Span to various smir types Had to make few extra changes to few structs to attach spans to them. r? ``@oli-obk``

Update Rust toolchain from nightly-2023-10-05 to nightly-2023-10-06 without any other source changes. This is an automatically generated pull request. If any of the CI checks fail, manual intervention is required. In such a case, review the changes at https://github.com/rust-lang/rust from rust-lang@2bbb619 up to rust-lang@cae0791. The log for this commit range is: rust-lang@cae0791da4 Auto merge of rust-lang#116417 - ouz-a:trait_type_detective, r=compiler-errors rust-lang@e30d27be00 remove is global hack rust-lang@cdca82c2c8 Auto merge of rust-lang#116455 - matthiaskrgr:rollup-p226a5u, r=matthiaskrgr rust-lang@76d0b794cb Rollup merge of rust-lang#116452 - cjgillot:noassert-erased, r=oli-obk rust-lang@c1c5ab717e Rollup merge of rust-lang#116428 - Alexendoo:note-duplicate-diagnostics, r=compiler-errors,estebank rust-lang@08cc7428d9 Rollup merge of rust-lang#116415 - ouz-a:move_subtyper, r=oli-obk rust-lang@b301bd4220 Rollup merge of rust-lang#116288 - ouz-a:smir_spans, r=spastorino rust-lang@864e5d8d94 Rollup merge of rust-lang#116220 - llogiq:stabilize-option-as-slice, r=BurntSushi rust-lang@3088c4b046 move subtyper change reveal_all rust-lang@14c846cb05 Do not assert that hidden types don't have erased regions. rust-lang@3bcad65fbf Auto merge of rust-lang#103046 - JanBeh:PR_clarify_cmp_terminology, r=workingjubilee rust-lang@cf9fd95b1c Auto merge of rust-lang#114042 - liushuyu:ubuntu/i586-fpmath, r=workingjubilee rust-lang@86b031b734 docs: Correct terminology in std::cmp rust-lang@90f3a6f920 Auto merge of rust-lang#104153 - tspiteri:doc-float-constants, r=workingjubilee rust-lang@5c3a0e932b Auto merge of rust-lang#116427 - cjgillot:no-internal, r=oli-obk rust-lang@a49138e46e impl stable for kinds rust-lang@a79567b01c add span to statements rust-lang@e293927016 Auto merge of rust-lang#116443 - workingjubilee:rollup-r9mh13f, r=workingjubilee rust-lang@4a14a80605 Rollup merge of rust-lang#116432 - notriddle:master, r=fmease rust-lang@d7b02c3d40 Rollup merge of rust-lang#116431 - estebank:issue-80476, r=compiler-errors rust-lang@a9a389cf44 Rollup merge of rust-lang#116429 - fmease:clean-up-struct-field-suggs, r=compiler-errors rust-lang@cfce3a919d Rollup merge of rust-lang#116296 - compiler-errors:default-return, r=estebank rust-lang@ea3454eabb Rollup merge of rust-lang#116223 - catandcoder:master, r=cjgillot rust-lang@5236c8e1fa Auto merge of rust-lang#116273 - compiler-errors:refine2, r=tmandry rust-lang@b781645332 Auto merge of rust-lang#116184 - compiler-errors:afit-lint, r=tmandry rust-lang@5453a9f34d Add a note to duplicate diagnostics rust-lang@afe67fa2ef Auto merge of rust-lang#116370 - nnethercote:more-arena-stuff, r=cjgillot rust-lang@2f5249019e Apply suggestions from code review rust-lang@dd5f26c42d Fix spans for comments in rustfmt rust-lang@1f079cfb44 Point to closure return instead of output if defaulted rust-lang@89b14ae212 Fix clippy rust-lang@137b6d0b01 Point to where missing return type should go rust-lang@a46ccd8d3f Add URL to test case issues rust-lang@9266270ef5 Rename issue-\d .rs tests to have meaningful names rust-lang@041e54bd92 Tweak wording of E0562 rust-lang@867cc41b5b clean up struct field suggestions rust-lang@a198aff4a4 Add `crate_name` to test so that it can be renamed rust-lang@e63d19c4dd Remove mir::LocalDecl::internal. rust-lang@f44d116e1f Fix misuses of a vs an rust-lang@a2051dd578 Optimize some `alloc_from_iter` call sites. rust-lang@816383c60d Remove the `TypedArena::alloc_from_iter` specialization. rust-lang@c373d206cd Address review nits rust-lang@90dfa24415 Only reachable traits rust-lang@afea0b4eab Fill in prose to describe the `async_fn_in_trait` lint rust-lang@28d58f6524 Bless tests rust-lang@ec79720c1e Add async_fn_in_trait lint rust-lang@999a354a81 add span to terminator rust-lang@9130484db9 create localdecl and add span to it rust-lang@06d9602d33 Only trigger refine lint on reachable traits rust-lang@702da3b89c stabilize `Option::as_`(`mut_`)`slice` rust-lang@40a52cf55c core library: Disable fpmath tests for i386 ... rust-lang@c953b6c014 doc: expand description for f32 and f64 associated constants Co-authored-by: celinval <[email protected]>

ouz-a added 2 commits September 30, 2023 16:40

create localdecl and add span to it

9130484

add span to terminator

999a354

rustbot assigned oli-obk Sep 30, 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 Sep 30, 2023

This comment has been minimized.

Sign in to view

spastorino reviewed Oct 3, 2023

View reviewed changes

ouz-a force-pushed the smir_spans branch from 1f335e7 to eeadb78 Compare October 3, 2023 20:11

ouz-a added 2 commits October 5, 2023 11:15

add span to statements

a79567b

impl stable for kinds

a49138e

ouz-a force-pushed the smir_spans branch from 3d32728 to a49138e Compare October 5, 2023 08:15

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 Oct 5, 2023

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 5, 2023

Rollup merge of rust-lang#116288 - ouz-a:smir_spans, r=spastorino

f27068c

Add Span to various smir types Had to make few extra changes to few structs to attach spans to them. r? `@oli-obk`

This was referenced Oct 5, 2023

Rollup of 6 pull requests #116453

Closed

Rollup of 5 pull requests #116455

Merged

bors merged commit b301bd4 into rust-lang:master Oct 5, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 5, 2023

pvdrz mentioned this pull request Oct 6, 2023

Fix divergence from upstream master ferrocene/ferrocene#23

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Span to various smir types #116288

Add Span to various smir types #116288

ouz-a commented Sep 30, 2023

rustbot commented Sep 30, 2023

This comment has been minimized.

spastorino Oct 3, 2023

spastorino Oct 3, 2023

spastorino commented Oct 3, 2023 •

edited

Loading

ouz-a commented Oct 3, 2023

spastorino commented Oct 4, 2023

ouz-a commented Oct 4, 2023 •

edited

Loading

spastorino commented Oct 4, 2023

ouz-a commented Oct 5, 2023

spastorino commented Oct 5, 2023

bors commented Oct 5, 2023

Add Span to various smir types #116288

Add Span to various smir types #116288

Conversation

ouz-a commented Sep 30, 2023

rustbot commented Sep 30, 2023

This comment has been minimized.

spastorino Oct 3, 2023

Choose a reason for hiding this comment

spastorino Oct 3, 2023

Choose a reason for hiding this comment

spastorino commented Oct 3, 2023 • edited Loading

ouz-a commented Oct 3, 2023

spastorino commented Oct 4, 2023

ouz-a commented Oct 4, 2023 • edited Loading

spastorino commented Oct 4, 2023

ouz-a commented Oct 5, 2023

spastorino commented Oct 5, 2023

bors commented Oct 5, 2023

spastorino commented Oct 3, 2023 •

edited

Loading

ouz-a commented Oct 4, 2023 •

edited

Loading