fixup! codegen_llvm: check inline assembly constraints with LLVM

diff --git a/src/librustc_codegen_llvm/builder.rs b/src/librustc_codegen_llvm/builder.rs
index afb87e2723f8aa10510922594105dd3591496dd7..77de88997e4903ebc0326203049a4d1756e670a7 100644 (file)
--- a/src/librustc_codegen_llvm/builder.rs
+++ b/src/librustc_codegen_llvm/builder.rs
@@ -756,7 +756,7 @@ pub fn inline_asm_call(&self, asm: *const c_char, cons: *const c_char,
             // Ask LLVM to verify that the constraints are well-formed.
             let constraints_ok = llvm::LLVMRustInlineAsmVerify(fty, cons);
             debug!("Constraint verification result: {:?}", constraints_ok);
-            if constraints_ok == 1 {
+            if constraints_ok == llvm::True {
                 let v = llvm::LLVMRustInlineAsm(
                     fty, asm, cons, volatile, alignstack, dia);
                 Some(self.call(v, inputs, None))

diff --git a/src/librustc_codegen_llvm/mir/statement.rs b/src/librustc_codegen_llvm/mir/statement.rs
index eb7eb1dbd468a2152bc6fb6b0d5e0359fb15662a..6bd41bfe16feee3d6c23e6f8fd8eb271ecc45123 100644 (file)
--- a/src/librustc_codegen_llvm/mir/statement.rs
+++ b/src/librustc_codegen_llvm/mir/statement.rs
@@ -88,7 +88,8 @@ pub fn codegen_statement(&mut self,
 
                 let res = asm::codegen_inline_asm(&bx, asm, outputs, input_vals);
                 if !res {
-                    span_err!(bx.sess(), statement.source_info.span, E0668, "malformed inline assembly");
+                    span_err!(bx.sess(), statement.source_info.span, E0668,
+                              "malformed inline assembly");
                 }
                 bx
             }