Adapt to latest rustc master changes

Author: denismerigoux

src/librustc_codegen_llvm/asm.rs

@@ -57,7 +57,7 @@ impl AsmBuilderMethods<'a, 'll, 'tcx> for Builder<'a, 'll, 'tcx, &'ll Value> {
 
     // Default per-arch clobbers
     // Basically what clang does
-    let arch_clobbers = match &bx.sess().target.target.arch[..] {
+    let arch_clobbers = match &self.cx().sess().target.target.arch[..] {
         "x86" | "x86_64"  => vec!["~{dirflag}", "~{fpsr}", "~{flags}"],
         "mips" | "mips64" => vec!["~{$1}"],
         _                 => Vec::new()
@@ -76,14 +76,14 @@ impl AsmBuilderMethods<'a, 'll, 'tcx> for Builder<'a, 'll, 'tcx, &'ll Value> {
     // Depending on how many outputs we have, the return type is different
     let num_outputs = output_types.len();
     let output_type = match num_outputs {
-        0 => bx.cx().type_void(),
+        0 => self.cx().type_void(),
         1 => output_types[0],
-        _ => bx.cx().type_struct(&output_types, false)
+        _ => self.cx().type_struct(&output_types, false)
     };
 
     let asm = CString::new(ia.asm.as_str().as_bytes()).unwrap();
     let constraint_cstr = CString::new(all_constraints).unwrap();
-    let r = bx.inline_asm_call(
+    let r = self.inline_asm_call(
         asm.as_ptr(),
         constraint_cstr.as_ptr(),
         &inputs,
@@ -100,8 +100,8 @@ impl AsmBuilderMethods<'a, 'll, 'tcx> for Builder<'a, 'll, 'tcx, &'ll Value> {
     // Again, based on how many outputs we have
     let outputs = ia.outputs.iter().zip(&outputs).filter(|&(ref o, _)| !o.is_indirect);
     for (i, (_, &place)) in outputs.enumerate() {
-        let v = if num_outputs == 1 { r } else { bx.extract_value(r, i as u64) };
-        OperandValue::Immediate(v).store(bx, place);
+        let v = if num_outputs == 1 { r } else { self.extract_value(r, i as u64) };
+        OperandValue::Immediate(v).store(self, place);
     }
 
         // Store mark in a metadata node so we can map LLVM errors
@@ -116,9 +116,9 @@ impl AsmBuilderMethods<'a, 'll, 'tcx> for Builder<'a, 'll, 'tcx, &'ll Value> {
             llvm::LLVMSetMetadata(r, kind,
                 llvm::LLVMMDNodeInContext(self.cx().llcx, &val, 1));
         }
-    }
 
     return true;
+    }
 }
 
 impl AsmMethods for CodegenCx<'ll, 'tcx, &'ll Value> {

src/librustc_codegen_llvm/interfaces/asm.rs

@@ -20,7 +20,7 @@ pub trait AsmBuilderMethods<'a, 'll: 'a, 'tcx: 'll> : HasCodegen<'a, 'll, 'tcx>{
         ia: &InlineAsm,
         outputs: Vec<PlaceRef<'tcx, <Self::CodegenCx as Backend<'ll>>::Value>>,
         inputs: Vec<<Self::CodegenCx as Backend<'ll>>::Value>
-    );
+    ) -> bool;
 }
 
 pub trait AsmMethods {

src/librustc_codegen_llvm/interfaces/builder.rs

@@ -386,7 +386,7 @@ pub trait BuilderMethods<'a, 'll :'a, 'tcx: 'll> : HasCodegen<'a, 'll, 'tcx> +
         volatile: bool,
         alignstack: bool,
         dia: AsmDialect
-    ) -> <Self::CodegenCx as Backend<'ll>>::Value;
+    ) -> Option<<Self::CodegenCx as Backend<'ll>>::Value>;
 
     fn minnum(
         &self,

src/librustc_codegen_llvm/mir/statement.rs

@@ -100,13 +100,13 @@ impl<'a, 'f, 'll: 'a + 'f, 'tcx: 'll, Cx: CodegenMethods<'ll, 'tcx>>
                 });
 
                 if input_vals.is_err() {
-                   span_err!(bx.cx.sess(), statement.source_info.span, E0669,
+                   span_err!(bx.cx().sess(), statement.source_info.span, E0669,
                              "invalid value for constraint in inline assembly");
                 } else {
                     let input_vals = input_vals.unwrap();
-                    let res = asm::codegen_inline_asm(&bx, asm, outputs, input_vals);
+                    let res = xb.codegen_inline_asm(asm, outputs, input_vals);
                     if !res {
-                        span_err!(bx.cx.sess(), statement.source_info.span, E0668,
+                        span_err!(bx.cx().sess(), statement.source_info.span, E0668,
                                   "malformed inline assembly");
                     }
                 }