Queryify Vtable methods #45137

theotherjimmy · Oct 9, 2017

This query might come with a downside: It converts an iterator to a Vec, which may increase the working set of rustc on programs that use many many traits (I think that's where this is used).

rust-highfive · Oct 9, 2017

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

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

nikomatsakis · Oct 9, 2017

nikomatsakis requested changes Oct 9, 2017

View changes

Looks good! Left a few minor suggestions.

nikomatsakis · Oct 9, 2017

src/librustc/ty/maps/mod.rs

@@ -227,6 +227,8 @@ define_maps! { <'tcx>
    [] fn item_body_nested_bodies: ItemBodyNestedBodies(DefId) -> ExternBodyNestedBodies,
    [] fn const_is_rvalue_promotable_to_static: ConstIsRvaluePromotableToStatic(DefId) -> bool,
    [] fn is_mir_available: IsMirAvailable(DefId) -> bool,
+    [] fn vtable_methods: vtable_methods_node(ty::PolyTraitRef<'tcx>)
+                          -> Vec<Option<(DefId, &'tcx Substs<'tcx>)>>,


Returning Rc<Vec<Option<..>>> would be better.

Right! I had that change before, I should re-apply that patch.

nikomatsakis · Oct 9, 2017

src/librustc/traits/mod.rs

@@ -650,12 +650,12 @@ pub fn normalize_and_test_predicates<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
 /// Given a trait `trait_ref`, iterates the vtable entries
 /// that come from `trait_ref`, including its supertraits.
 #[inline] // FIXME(#35870) Avoid closures being unexported due to impl Trait.
-pub fn get_vtable_methods<'a, 'tcx>(
+pub fn vtable_methods<'a, 'tcx>(


This need not be public anymore.

🤦‍ Yep, Another one that I'll do real quick.

theotherjimmy · Oct 9, 2017

@nikomatsakis Thanks for the review. I corrected all of the minor suggestions.

nikomatsakis · Oct 9, 2017

nikomatsakis approved these changes Oct 9, 2017

View changes

nikomatsakis · Oct 9, 2017

@bors r+

bors · Oct 9, 2017

📌 Commit cb7e101 has been approved by nikomatsakis

bors · Oct 11, 2017

⌛️ Testing commit cb7e101 with merge e66fd14...

bors · Oct 11, 2017

💔 Test failed - status-travis

theotherjimmy · Oct 11, 2017

I don't think this is my fault:

Failed to fetch URL https://dl.google.com/android/repository/addons_list-2.xml, reason: peer not authenticated

kennytm · Oct 11, 2017

@bors retry

Android SDK HTTPS issue (fixed in #45193)

bors · Oct 12, 2017

☔️ The latest upstream changes (presumably #44967) made this pull request unmergeable. Please resolve the merge conflicts.

aidanhs · Oct 12, 2017

@bors r=nikomatsakis

bors · Oct 12, 2017

📌 Commit 09258e7 has been approved by nikomatsakis

aidanhs · Oct 12, 2017

Wait @bors r-

[00:08:12] �[1m�[31merror�(B�[m�[1m: recursion limit reached while expanding the macro `stringify`�(B�[m
[00:08:12]    �(B�[m�[1m�[34m--> �(B�[m/checkout/src/librustc/ty/maps/plumbing.rs:563:26�(B�[m
[00:08:12]     �(B�[m�[1m�[34m|�(B�[m
[00:08:12] �[1m�[34m563�(B�[m �(B�[m�[1m�[34m| �(B�[m  �(B�[m                         stringify!($name), key);�(B�[m
[00:08:12]     �(B�[m�[1m�[34m| �(B�[m                           �(B�[m�[1m�[31m^^^^^^^^^^^^^^^^^�(B�[m
[00:08:12]     �(B�[m�[1m�[34m| �(B�[m
[00:08:12]    �(B�[m�[1m�[34m::: �(B�[m/checkout/src/librustc/ty/maps/mod.rs�(B�[m
[00:08:12]     �(B�[m�[1m�[34m|�(B�[m
[00:08:12] �[1m�[34m78�(B�[m  �(B�[m�[1m�[34m| �(B�[m�[1m�[34m/�(B�[m �(B�[mdefine_maps! { <'tcx>�(B�[m
[00:08:12] �[1m�[34m79�(B�[m  �(B�[m�[1m�[34m| �(B�[m�[1m�[34m|�(B�[m �(B�[m    /// Records the type of every item.�(B�[m
[00:08:12] �[1m�[34m80�(B�[m  �(B�[m�[1m�[34m| �(B�[m�[1m�[34m|�(B�[m �(B�[m    [] fn type_of: TypeOfItem(DefId) -> Ty<'tcx>,�(B�[m
[00:08:12] �[1m�[34m81�(B�[m  �(B�[m�[1m�[34m| �(B�[m�[1m�[34m|�(B�[m
[00:08:12] �[1m�[34m...�(B�[m   �(B�[m�[1m�[34m|�(B�[m
[00:08:12] �[1m�[34m341�(B�[m �(B�[m�[1m�[34m| �(B�[m�[1m�[34m|�(B�[m �(B�[m    [] fn has_clone_closures: HasCloneClosures(CrateNum) -> bool,�(B�[m
[00:08:12] �[1m�[34m342�(B�[m �(B�[m�[1m�[34m| �(B�[m�[1m�[34m|�(B�[m �(B�[m}�(B�[m
[00:08:12]     �(B�[m�[1m�[34m| �(B�[m�[1m�[34m|_-�(B�[m �(B�[m�[1m�[34min this macro invocation�(B�[m
[00:08:12]     �(B�[m�[1m�[34m|�(B�[m
[00:08:12]     �(B�[m�[1m�[34m= �(B�[m�[1mhelp�(B�[m: consider adding a `#![recursion_limit="512"]` attribute to your crate�(B�[m
[00:08:12] 
[00:08:12] �[m�[m�[31m�[1merror:�[m Could not compile `rustc`.

theotherjimmy · Oct 12, 2017

Well, the good is that I can reproduce the problem. The bad is that I have no idea why it's happening.

theotherjimmy · Oct 12, 2017

It seems like the macro that implements the provider structure, define_provider_struct!, was using some pretty heavy recursion to move data around. I'm working on a direct version of that macro now.

theotherjimmy · Oct 12, 2017

@nikomatsakis @michaelwoerister This change set now includes a big change to plumbing.rs, which should be scrutinized.

nikomatsakis · Oct 13, 2017

nikomatsakis reviewed Oct 13, 2017

View changes

nikomatsakis · Oct 13, 2017

src/librustc/ty/maps/plumbing.rs

    (tcx: $tcx:tt,
-     input: (),
-     output: ($(([$name:ident] [$K:ty] [$R:ty]))*)) => {
+     input: ($(([$($modifiers:tt)*] [$name:ident] [$K:ty] [$R:ty]))*)) => {


This change looks fine. It does mean we lose the ability to have modifiers that adjust the type of a query's field. At present, we are not using this capability (we used to be...), so that's probably ok, but we could also just lift the recursion-limit, right?

I'm ok either way, but let's also rebase and remove the merge commit.

theotherjimmy · Oct 13, 2017

Rebasing. Just a moment.

theotherjimmy · Oct 13, 2017

@nikomatsakis rebase complete. Merge commit removed.

nikomatsakis · Oct 13, 2017

@bors r+

bors · Oct 13, 2017

📌 Commit fcb8bc9 has been approved by nikomatsakis

bors · Oct 14, 2017

⌛️ Testing commit fcb8bc9 with merge 3037965...

bors · Oct 14, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 3037965 to master...

michaelwoerister · Oct 16, 2017

🎉

rust-highfive assigned nikomatsakis Oct 9, 2017

theotherjimmy force-pushed the theotherjimmy:vtable-methods-query branch from 6225f8a to cb7e101 Oct 9, 2017

theotherjimmy referenced this pull request Oct 10, 2017
Closed
Extract queries for the trait system operations that are performed in trans #44891

aidanhs added the S-waiting-on-bors label Oct 12, 2017

kennytm added S-waiting-on-review and removed S-waiting-on-bors labels Oct 13, 2017

theotherjimmy added some commits Oct 7, 2017

Convert return type of get_vtable_methods to Vec

4e116e1

get_vtable_methods => vtable_methods query

b640c2b

Wrap vtable_methods return type in RC

81f9d4e

Remove export of vtable_methods

2160bab

Remove recursion from `define_{provider|map}_struct`

Loading status checks…

fcb8bc9

theotherjimmy force-pushed the theotherjimmy:vtable-methods-query branch from 34cefbd to fcb8bc9 Oct 13, 2017

kennytm added S-waiting-on-bors and removed S-waiting-on-review labels Oct 13, 2017

bors merged commit fcb8bc9 into rust-lang:master Oct 14, 2017
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

This was referenced Oct 14, 2017

Merged

Refactor type memory layouts and ABIs, to be more general and easier to optimize. #45225

Merged

remove or encapsulate the remaining non-query data in tcx #44501

rust-lang/rust

Join GitHub today

Queryify Vtable methods #45137

Conversation

theotherjimmy commented Oct 9, 2017

rust-highfive assigned nikomatsakis Oct 9, 2017

This comment has been minimized.

rust-highfive commented Oct 9, 2017

nikomatsakis requested changes Oct 9, 2017 View changes

nikomatsakis left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

theotherjimmy commented Oct 9, 2017

theotherjimmy force-pushed the theotherjimmy:vtable-methods-query branch from 6225f8a to cb7e101 Oct 9, 2017

nikomatsakis approved these changes Oct 9, 2017 View changes

This comment has been minimized.

nikomatsakis commented Oct 9, 2017

This comment has been minimized.

bors commented Oct 9, 2017

theotherjimmy referenced this pull request Oct 10, 2017

This comment has been minimized.

bors commented Oct 11, 2017

bors added a commit that referenced this pull request Oct 11, 2017

This comment has been minimized.

bors commented Oct 11, 2017

This comment has been minimized.

theotherjimmy commented Oct 11, 2017

This comment has been minimized.

kennytm commented Oct 11, 2017

This comment has been minimized.

bors commented Oct 12, 2017

This comment has been minimized.

aidanhs commented Oct 12, 2017

This comment has been minimized.

bors commented Oct 12, 2017

aidanhs added the S-waiting-on-bors label Oct 12, 2017

This comment has been minimized.

aidanhs commented Oct 12, 2017

This comment has been minimized.

theotherjimmy commented Oct 12, 2017

This comment has been minimized.

theotherjimmy commented Oct 12, 2017 • edited

This comment has been minimized.

theotherjimmy commented Oct 12, 2017

kennytm added S-waiting-on-review and removed S-waiting-on-bors labels Oct 13, 2017

nikomatsakis reviewed Oct 13, 2017 View changes

This comment has been minimized.

This comment has been minimized.

theotherjimmy commented Oct 13, 2017

theotherjimmy added some commits Oct 7, 2017

theotherjimmy force-pushed the theotherjimmy:vtable-methods-query branch from 34cefbd to fcb8bc9 Oct 13, 2017

This comment has been minimized.

theotherjimmy commented Oct 13, 2017

This comment has been minimized.

nikomatsakis commented Oct 13, 2017

This comment has been minimized.

bors commented Oct 13, 2017

kennytm added S-waiting-on-bors and removed S-waiting-on-review labels Oct 13, 2017

This comment has been minimized.

bors commented Oct 14, 2017

bors added a commit that referenced this pull request Oct 14, 2017

This comment has been minimized.

bors commented Oct 14, 2017

Hide details View details bors merged commit fcb8bc9 into rust-lang:master Oct 14, 2017 2 checks passed

2 checks passed

This was referenced Oct 14, 2017

This comment has been minimized.

michaelwoerister commented Oct 16, 2017

nikomatsakis requested changes Oct 9, 2017

View changes

theotherjimmy force-pushed the theotherjimmy:vtable-methods-query branch from `6225f8a` to `cb7e101` Oct 9, 2017

nikomatsakis approved these changes Oct 9, 2017

View changes

theotherjimmy commented Oct 12, 2017 •

edited

nikomatsakis reviewed Oct 13, 2017

View changes

theotherjimmy force-pushed the theotherjimmy:vtable-methods-query branch from `34cefbd` to `fcb8bc9` Oct 13, 2017

bors merged commit `fcb8bc9` into rust-lang:master Oct 14, 2017
2 checks passed