diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2017-05-19 17:27:25 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2017-06-01 12:56:30 -0400 |
| commit | 541523d10dce98dc266f6d4e6fb6131182c0f791 (patch) | |
| tree | 8a9f72b4e0c7d4e1ec48d65440016fac921337a0 /src/librustc_mir/transform | |
| parent | 6c4b961effdbec1bb2fc5aaed5aeb219eb7f3b19 (diff) | |
| download | rust-541523d10dce98dc266f6d4e6fb6131182c0f791.tar.gz rust-541523d10dce98dc266f6d4e6fb6131182c0f791.zip | |
rewrite layout to take a (param-env, ty) pair instead of infcx
Diffstat (limited to 'src/librustc_mir/transform')
| -rw-r--r-- | src/librustc_mir/transform/inline.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs index 8842d30b65c..0ac35a5fdd4 100644 --- a/src/librustc_mir/transform/inline.rs +++ b/src/librustc_mir/transform/inline.rs @@ -547,10 +547,8 @@ impl<'a, 'tcx> Inliner<'a, 'tcx> { fn type_size_of<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, param_env: ty::ParamEnv<'tcx>, ty: Ty<'tcx>) -> Option<u64> { - tcx.infer_ctxt(param_env.reveal_all()).enter(|infcx| { - ty.layout(&infcx).ok().map(|layout| { - layout.size(&tcx.data_layout).bytes() - }) + ty.layout(tcx, param_env).ok().map(|layout| { + layout.size(&tcx.data_layout).bytes() }) } |