rustc: move mir::SourceScopeLocalData to a field of SourceScopeData. #66789

eddyb · 2019-11-26T20:38:49Z

By having one ClearCrossCrate<SourceScopeLocalData> for each scope, as opposed to a single ClearCrossCrate for all the SourceScopeLocalDatas, we can represent the fact that some scopes have SourceScopeLocalData associated with them, and some don't.

This is useful when doing MIR inlining across crates, because the ClearCrossCrate will be Clear for the cross-crate MIR scopes and Set for the local ones.

Also see #66203 (comment) for some context around this approach.

Fixes #51314.

rust-highfive · 2019-11-26T20:38:53Z

r? @estebank

(rust_highfive has picked a reviewer for you, use r? to override)

oli-obk · 2019-11-26T20:55:18Z

r? @oli-obk

oli-obk · 2019-11-27T09:14:09Z

src/librustc_mir/transform/inline.rs

@@ -395,16 +395,25 @@ impl Inliner<'tcx> {
                let mut local_map = IndexVec::with_capacity(callee_body.local_decls.len());
                let mut scope_map = IndexVec::with_capacity(callee_body.source_scopes.len());

-                for mut scope in callee_body.source_scopes.iter().cloned() {
+                for (callee_idx, scope) in callee_body.source_scopes.iter_enumerated() {


cc @Centril @wesleywiser this PR may in fact be fixing the inliner ICE encountered during stage2 building

oli-obk · 2019-11-27T09:18:51Z

@bors r+

bors · 2019-11-27T09:18:53Z

📌 Commit abed9e8034b0527ee00e6edf0e3b99baebe257de has been approved by oli-obk

eddyb · 2019-11-28T14:06:20Z

@bors r=oli-obk

bors · 2019-11-28T14:06:22Z

📌 Commit 3aead85 has been approved by oli-obk

…r=oli-obk rustc: move mir::SourceScopeLocalData to a field of SourceScopeData. By having one `ClearCrossCrate<SourceScopeLocalData>` for each scope, as opposed to a single `ClearCrossCrate` for all the `SourceScopeLocalData`s, we can represent the fact that some scopes have `SourceScopeLocalData` associated with them, and some don't. This is useful when doing MIR inlining across crates, because the `ClearCrossCrate` will be `Clear` for the cross-crate MIR scopes and `Set` for the local ones. Also see rust-lang#66203 (comment) for some context around this approach. Fixes rust-lang#51314.

…d elements.

eddyb · 2019-11-29T23:49:17Z

@bors r=oli-obk

Centril · 2019-11-30T07:58:59Z

@bors retry spurious

…r=oli-obk rustc: move mir::SourceScopeLocalData to a field of SourceScopeData. By having one `ClearCrossCrate<SourceScopeLocalData>` for each scope, as opposed to a single `ClearCrossCrate` for all the `SourceScopeLocalData`s, we can represent the fact that some scopes have `SourceScopeLocalData` associated with them, and some don't. This is useful when doing MIR inlining across crates, because the `ClearCrossCrate` will be `Clear` for the cross-crate MIR scopes and `Set` for the local ones. Also see rust-lang#66203 (comment) for some context around this approach. Fixes rust-lang#51314.

@ghost

Rollup of 7 pull requests Successful merges: - #66346 (Replace .unwrap() with ? in std::os::unix::net) - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.) - #66822 (libunwind_panic: adjust miri panic hack) - #66827 (handle diverging functions forwarding their return place) - #66828 (Less minification) - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.) - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.) Failed merges: - #66874 (Miri engine: proper support for `Assert` MIR terminators) r? @ghost

@ghost

Rollup of 7 pull requests Successful merges: - #66346 (Replace .unwrap() with ? in std::os::unix::net) - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.) - #66822 (libunwind_panic: adjust miri panic hack) - #66827 (handle diverging functions forwarding their return place) - #66828 (Less minification) - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.) - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.) Failed merges: - #66874 (Miri engine: proper support for `Assert` MIR terminators) r? @ghost

…r=oli-obk rustc: move mir::SourceScopeLocalData to a field of SourceScopeData. By having one `ClearCrossCrate<SourceScopeLocalData>` for each scope, as opposed to a single `ClearCrossCrate` for all the `SourceScopeLocalData`s, we can represent the fact that some scopes have `SourceScopeLocalData` associated with them, and some don't. This is useful when doing MIR inlining across crates, because the `ClearCrossCrate` will be `Clear` for the cross-crate MIR scopes and `Set` for the local ones. Also see rust-lang#66203 (comment) for some context around this approach. Fixes rust-lang#51314.

@ghost

Rollup of 7 pull requests Successful merges: - #66346 (Replace .unwrap() with ? in std::os::unix::net) - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.) - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.) - #66905 (rustc_plugin: Remove some remaining plugin features) - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.) - #66918 (Add crc and crypto to target feature whitelist on arm) - #66926 (add reusable MachineStop variant to Miri engine error enum) Failed merges: r? @ghost

Rustup to rust-lang/rust#66789 changelog: none

Changes: ```` Normalize custom ICE test Rustup to rust-lang#64736 Use assert_crate_local for a more explicit error Rustup to rust-lang#66789 account for external macro in MISSING_INLINE_IN_PUBLIC_ITEMS lint build(tests/fmt): use shared target dir chore: fix and split some ui tests on 32bit system build: set up build job for i686 targets remove needless my_lint ui test git quiet deploy: cd to out/ before adding files to git Less needless_doctest_main false positives fmt Feed the dog Use rustc_env instead of exec_env for test Make triggering this lint less likely 📎 Use exec_env to set backtrace level and normalize output Update custom ICE function with latest rustc Use Clippy version in ICE message Add custom ICE message that points to Clippy repo Fix master deployment Run update_lints Add projections check to EUV for escape analysis Use infer_ctxt Move use_self to nursery Use `println!` on success instead of `eprintln!` Revert "Disable chalk integration test. Output too large" Remove the old integration-tests.sh script Use rust implementation for integration tests in CI Rust implementation of integration test Don't error on clippy.toml of dependencies Fix categorizations Fix arguments on ExprUseVisitor::new euv moved from middle to typeck cmt_ -> Place build: check if RTIM is not installed make use of Result::map_or trigger string_lit_as_bytes when literal has escapes Remove negative float literal checks. Enable deny-warnings feature everywhere in CI Remove unused debugging feature implemented `as_conversions` lint fixing a typo [comparison_chain] rust-lang#4827 Check `core::cmp::Ord` is implemented add a good example for the approx_const lint Add suggested good cases in docs for lifetimes lint ````

Changes: ```` Normalize custom ICE test Rustup to rust-lang/rust#64736 Use assert_crate_local for a more explicit error Rustup to rust-lang/rust#66789 account for external macro in MISSING_INLINE_IN_PUBLIC_ITEMS lint build(tests/fmt): use shared target dir chore: fix and split some ui tests on 32bit system build: set up build job for i686 targets remove needless my_lint ui test git quiet deploy: cd to out/ before adding files to git Less needless_doctest_main false positives fmt Feed the dog Use rustc_env instead of exec_env for test Make triggering this lint less likely 📎 Use exec_env to set backtrace level and normalize output Update custom ICE function with latest rustc Use Clippy version in ICE message Add custom ICE message that points to Clippy repo Fix master deployment Run update_lints Add projections check to EUV for escape analysis Use infer_ctxt Move use_self to nursery Use `println!` on success instead of `eprintln!` Revert "Disable chalk integration test. Output too large" Remove the old integration-tests.sh script Use rust implementation for integration tests in CI Rust implementation of integration test Don't error on clippy.toml of dependencies Fix categorizations Fix arguments on ExprUseVisitor::new euv moved from middle to typeck cmt_ -> Place build: check if RTIM is not installed make use of Result::map_or trigger string_lit_as_bytes when literal has escapes Remove negative float literal checks. Enable deny-warnings feature everywhere in CI Remove unused debugging feature implemented `as_conversions` lint fixing a typo [comparison_chain] rust-lang#4827 Check `core::cmp::Ord` is implemented add a good example for the approx_const lint Add suggested good cases in docs for lifetimes lint ````

rust-highfive assigned estebank Nov 26, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 26, 2019

rust-highfive assigned oli-obk and unassigned estebank Nov 26, 2019

eddyb mentioned this pull request Nov 26, 2019

Fix generating CTFE backtrace on optimized MIR #66203

Closed

oli-obk reviewed Nov 27, 2019

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 Nov 27, 2019

This comment has been minimized.

Sign in to view

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 Nov 27, 2019

eddyb force-pushed the mir-source-scope-local-data branch from abed9e8 to 3aead85 Compare November 28, 2019 14:04

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 Nov 28, 2019

RalfJung mentioned this pull request Nov 29, 2019

Rollup of 11 pull requests #66875

Closed

This comment has been minimized.

Sign in to view

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 Nov 29, 2019

eddyb added 3 commits November 30, 2019 01:36

rustc: move MIR source_scope_local_data's ClearCrossCrate to be aroun…

30a9978

…d elements.

rustc_mir: fix inliner to also copy over source_scope_local_data.

78d85fc

rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.

a9976d8

eddyb force-pushed the mir-source-scope-local-data branch from 3aead85 to a9976d8 Compare November 29, 2019 23:49

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 Nov 30, 2019

Centril mentioned this pull request Dec 1, 2019

Rollup of 7 pull requests #66924

Closed

Centril mentioned this pull request Dec 2, 2019

Rollup of 7 pull requests #66944

Merged

bors merged commit a9976d8 into rust-lang:master Dec 2, 2019

phansch added a commit to phansch/rust-clippy that referenced this pull request Dec 2, 2019

Rustup to rust-lang/rust#66789

6669c2c

phansch mentioned this pull request Dec 2, 2019

Rustup to https://github.com/rust-lang/rust/pull/66789 rust-lang/rust-clippy#4873

Merged

eddyb deleted the mir-source-scope-local-data branch December 2, 2019 10:29

bors added a commit to rust-lang/rust-clippy that referenced this pull request Dec 2, 2019

Auto merge of #4873 - phansch:rustup2, r=eddyb

574f3fd

Rustup to rust-lang/rust#66789 changelog: none

oli-obk mentioned this pull request Dec 29, 2019

MIR inlining does not handle SourceScopeLocalData #66137

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rustc: move mir::SourceScopeLocalData to a field of SourceScopeData. #66789

rustc: move mir::SourceScopeLocalData to a field of SourceScopeData. #66789

eddyb commented Nov 26, 2019

rust-highfive commented Nov 26, 2019

oli-obk commented Nov 26, 2019

oli-obk Nov 27, 2019

oli-obk commented Nov 27, 2019

bors commented Nov 27, 2019

This comment has been minimized.

eddyb commented Nov 28, 2019

bors commented Nov 28, 2019

This comment has been minimized.

eddyb commented Nov 29, 2019

Centril commented Nov 30, 2019

rustc: move mir::SourceScopeLocalData to a field of SourceScopeData. #66789

rustc: move mir::SourceScopeLocalData to a field of SourceScopeData. #66789

Conversation

eddyb commented Nov 26, 2019

rust-highfive commented Nov 26, 2019

oli-obk commented Nov 26, 2019

oli-obk Nov 27, 2019

Choose a reason for hiding this comment

oli-obk commented Nov 27, 2019

bors commented Nov 27, 2019

This comment has been minimized.

eddyb commented Nov 28, 2019

bors commented Nov 28, 2019

This comment has been minimized.

eddyb commented Nov 29, 2019

Centril commented Nov 30, 2019