about summary refs log tree commit diff
path: root/src/librustc_trans/asm.rs
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2016-12-31 16:00:24 -0700
committerMark Simulacrum <mark.simulacrum@gmail.com>2017-01-04 11:33:31 -0700
commit1be170b01addf84534b51d68e2d5ac76a1a42ac6 (patch)
tree70ba37fde7786c1bda8ce4b84b7c9db92f965163 /src/librustc_trans/asm.rs
parentd40d01bd0e7d9d20bb3454a3d0870f00b805a01c (diff)
downloadrust-1be170b01addf84534b51d68e2d5ac76a1a42ac6.tar.gz
rust-1be170b01addf84534b51d68e2d5ac76a1a42ac6.zip
Replace BlockAndBuilder with Builder.
Diffstat (limited to 'src/librustc_trans/asm.rs')
-rw-r--r--src/librustc_trans/asm.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/librustc_trans/asm.rs b/src/librustc_trans/asm.rs
index 05699fb9de9..0912e54bf53 100644
--- a/src/librustc_trans/asm.rs
+++ b/src/librustc_trans/asm.rs
@@ -15,6 +15,7 @@ use base;
 use common::*;
 use type_of;
 use type_::Type;
+use builder::Builder;
 
 use rustc::hir;
 use rustc::ty::Ty;
@@ -25,7 +26,7 @@ use libc::{c_uint, c_char};
 
 // Take an inline assembly expression and splat it out via LLVM
 pub fn trans_inline_asm<'a, 'tcx>(
-    bcx: &BlockAndBuilder<'a, 'tcx>,
+    bcx: &Builder<'a, 'tcx>,
     ia: &hir::InlineAsm,
     outputs: Vec<(ValueRef, Ty<'tcx>)>,
     mut inputs: Vec<ValueRef>
@@ -61,7 +62,7 @@ pub fn trans_inline_asm<'a, 'tcx>(
 
     // Default per-arch clobbers
     // Basically what clang does
-    let arch_clobbers = match &bcx.sess().target.target.arch[..] {
+    let arch_clobbers = match &bcx.ccx.sess().target.target.arch[..] {
         "x86" | "x86_64" => vec!["~{dirflag}", "~{fpsr}", "~{flags}"],
         _                => Vec::new()
     };