bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix LLVMRustInlineAsmVerify return type mismatch

Browse source
This commit is contained in:
varkor 2018-10-16 18:19:04 +01:00
parent 5ea8eb55cd
commit f40932f106
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_codegen_llvm/builder.rs
View file

@ -756,7 +756,7 @@ impl Builder<'a, 'll, 'tcx> {
// Ask LLVM to verify that the constraints are well-formed. // Ask LLVM to verify that the constraints are well-formed.
let constraints_ok = llvm::LLVMRustInlineAsmVerify(fty, cons); let constraints_ok = llvm::LLVMRustInlineAsmVerify(fty, cons);
debug!("Constraint verification result: {:?}", constraints_ok); debug!("Constraint verification result: {:?}", constraints_ok);
if constraints_ok == llvm::True { if constraints_ok {
let v = llvm::LLVMRustInlineAsm( let v = llvm::LLVMRustInlineAsm(
fty, asm, cons, volatile, alignstack, dia); fty, asm, cons, volatile, alignstack, dia);
Some(self.call(v, inputs, None)) Some(self.call(v, inputs, None))

4
src/librustc_codegen_llvm/llvm/ffi.rs
View file

@ -1212,8 +1212,8 @@ extern "C" {
Dialect: AsmDialect) Dialect: AsmDialect)
-> &Value; -> &Value;
pub fn LLVMRustInlineAsmVerify(Ty: &Type, pub fn LLVMRustInlineAsmVerify(Ty: &Type,
Constraints: *const c_char) Constraints: *const c_char)
-> Bool; -> bool;
pub fn LLVMRustDebugMetadataVersion() -> u32; pub fn LLVMRustDebugMetadataVersion() -> u32;
pub fn LLVMRustVersionMajor() -> u32; pub fn LLVMRustVersionMajor() -> u32;