diff options
| author | bors <bors@rust-lang.org> | 2018-04-26 16:00:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-26 16:00:48 +0000 |
| commit | 949010d23e9f7037a8e6f323588873b3d2438fb1 (patch) | |
| tree | 5fc47e5862bd70b8728e6eb204c815f007c8dcad /src/librustc_trans/context.rs | |
| parent | 88cd36714c6d62393f18d8efa2ea2724e1ec4a9d (diff) | |
| parent | a131c518ad640ccd12711ccd63d8b98cafa55ee9 (diff) | |
| download | rust-949010d23e9f7037a8e6f323588873b3d2438fb1.tar.gz rust-949010d23e9f7037a8e6f323588873b3d2438fb1.zip | |
Auto merge of #50228 - irinagpopa:backstory-v2, r=nikomatsakis
Rename rustc_back to rustc_target and move ABI code to it. Fixes #45226.
Diffstat (limited to 'src/librustc_trans/context.rs')
| -rw-r--r-- | src/librustc_trans/context.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/librustc_trans/context.rs b/src/librustc_trans/context.rs index 4d781d7280d..76f8be9ee98 100644 --- a/src/librustc_trans/context.rs +++ b/src/librustc_trans/context.rs @@ -31,6 +31,7 @@ use rustc::session::Session; use rustc::ty::layout::{LayoutError, LayoutOf, Size, TyLayout}; use rustc::ty::{self, Ty, TyCtxt}; use rustc::util::nodemap::FxHashMap; +use rustc_target::spec::{HasTargetSpec, Target}; use std::ffi::{CStr, CString}; use std::cell::{Cell, RefCell}; @@ -453,13 +454,20 @@ impl<'a, 'tcx> ty::layout::HasDataLayout for &'a CodegenCx<'a, 'tcx> { } } +impl<'a, 'tcx> HasTargetSpec for &'a CodegenCx<'a, 'tcx> { + fn target_spec(&self) -> &Target { + &self.tcx.sess.target.target + } +} + impl<'a, 'tcx> ty::layout::HasTyCtxt<'tcx> for &'a CodegenCx<'a, 'tcx> { fn tcx<'b>(&'b self) -> TyCtxt<'b, 'tcx, 'tcx> { self.tcx } } -impl<'a, 'tcx> LayoutOf<Ty<'tcx>> for &'a CodegenCx<'a, 'tcx> { +impl<'a, 'tcx> LayoutOf for &'a CodegenCx<'a, 'tcx> { + type Ty = Ty<'tcx>; type TyLayout = TyLayout<'tcx>; fn layout_of(self, ty: Ty<'tcx>) -> Self::TyLayout { |
