rollup merge of #18266 : nick29581/vtable2.rs

diff --cc src/librustc/middle/typeck/check/method.rs
Simple merge

diff --cc src/librustc/middle/typeck/check/mod.rs
Simple merge

diff --cc src/librustc/middle/typeck/check/regionck.rs
Simple merge