Skip to content

Commit 6f6878c

Browse files
committed
Rollup merge of rust-lang#55128 - varkor:LLVMRustInlineAsmVerify-return-bool, r=rkruppe
Fix LLVMRustInlineAsmVerify return type mismatch Fixes rust-lang#54918. r? @rkruppe cc @levex
2 parents eda6e06 + f40932f commit 6f6878c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/librustc_codegen_llvm/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ impl Builder<'a, 'll, 'tcx> {
756756
// Ask LLVM to verify that the constraints are well-formed.
757757
let constraints_ok = llvm::LLVMRustInlineAsmVerify(fty, cons);
758758
debug!("Constraint verification result: {:?}", constraints_ok);
759-
if constraints_ok == llvm::True {
759+
if constraints_ok {
760760
let v = llvm::LLVMRustInlineAsm(
761761
fty, asm, cons, volatile, alignstack, dia);
762762
Some(self.call(v, inputs, None))

src/librustc_codegen_llvm/llvm/ffi.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,8 +1212,8 @@ extern "C" {
12121212
Dialect: AsmDialect)
12131213
-> &Value;
12141214
pub fn LLVMRustInlineAsmVerify(Ty: &Type,
1215-
Constraints: *const c_char)
1216-
-> Bool;
1215+
Constraints: *const c_char)
1216+
-> bool;
12171217

12181218
pub fn LLVMRustDebugMetadataVersion() -> u32;
12191219
pub fn LLVMRustVersionMajor() -> u32;

0 commit comments

Comments
 (0)