Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

librustc: Update AutoObject adjustment in writeback. #14682

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc/middle/typeck/check/regionck.rs
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ fn visit_expr(rcx: &mut Rcx, expr: &ast::Expr) {
// function check_cast_for_escaping_regions() in kind.rs
// explaining how it goes about doing that.

let source_ty = rcx.fcx.expr_ty(expr);
let source_ty = rcx.resolve_node_type(expr.id);
constrain_regions_in_type(rcx, trait_region,
infer::RelateObjectBound(expr.span), source_ty);
}
Expand Down
9 changes: 8 additions & 1 deletion src/librustc/middle/typeck/check/writeback.rs
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,14 @@ impl<'cx> WritebackCx<'cx> {
})
}

adjustment => adjustment
ty::AutoObject(trait_store, bb, def_id, substs) => {
ty::AutoObject(
self.resolve(&trait_store, reason),
self.resolve(&bb, reason),
def_id,
self.resolve(&substs, reason)
)
}
};
debug!("Adjustments for node {}: {:?}", id, resolved_adjustment);
self.tcx().adjustments.borrow_mut().insert(
Expand Down
30 changes: 30 additions & 0 deletions src/test/run-pass/issue-11612.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// #11612
// We weren't updating the auto adjustments with all the resolved
// type information after type check.

trait A {}

struct B<'a, T> {
f: &'a T
}

impl<'a, T> A for B<'a, T> {}

fn foo(_: &A) {}

fn bar<G>(b: &B<G>) {
foo(b); // Coercion should work
foo(b as &A); // Explicit cast should work as well
}

fn main() {}