1
Fork 0

Rollup merge of #55128 - varkor:LLVMRustInlineAsmVerify-return-bool, r=rkruppe

Fix LLVMRustInlineAsmVerify return type mismatch

Fixes https://github.com/rust-lang/rust/issues/54918.

r? @rkruppe
cc @levex
This commit is contained in:
kennytm 2018-10-18 10:47:34 +08:00
commit 6f6878c073
No known key found for this signature in database
GPG key ID: FEF6C8051D0E013C
2 changed files with 3 additions and 3 deletions

View file

@ -756,7 +756,7 @@ impl Builder<'a, 'll, 'tcx> {
// 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 == llvm::True {
if constraints_ok {
let v = llvm::LLVMRustInlineAsm(
fty, asm, cons, volatile, alignstack, dia);
Some(self.call(v, inputs, None))

View file

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