diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2022-07-13 10:38:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-13 10:38:50 +0200 |
| commit | f290811aaf4a434d7bf25dda1ff16fa6bd930c8f (patch) | |
| tree | 4413e1a4577e03f945e2cc19ede341b27cc70daf /compiler/rustc_llvm/llvm-wrapper | |
| parent | 3eb8198cf88ac99eb26b8414f7ebfdb8b24c190c (diff) | |
| parent | a89d014a211386f2b0ead0d309a588c625d45514 (diff) | |
| download | rust-f290811aaf4a434d7bf25dda1ff16fa6bd930c8f.tar.gz rust-f290811aaf4a434d7bf25dda1ff16fa6bd930c8f.zip | |
Rollup merge of #99185 - krasimirgg:llvm-wrapper-inlineasm, r=nikic
llvm-wrapper: adapt for LLVM API change This adapts RustWrapper's ` LLVMRustInlineAsmVerify` for LLVM commit https://github.com/llvm/llvm-project/commit/00797b88e0113aeea03045b18b3f63332f850dfe.
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index 8c5b4e2dc96..7ac3157e7a1 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -411,8 +411,14 @@ LLVMRustInlineAsm(LLVMTypeRef Ty, char *AsmString, size_t AsmStringLen, extern "C" bool LLVMRustInlineAsmVerify(LLVMTypeRef Ty, char *Constraints, size_t ConstraintsLen) { +#if LLVM_VERSION_LT(15, 0) return InlineAsm::Verify(unwrap<FunctionType>(Ty), StringRef(Constraints, ConstraintsLen)); +#else + // llvm::Error converts to true if it is an error. + return !llvm::errorToBool(InlineAsm::verify( + unwrap<FunctionType>(Ty), StringRef(Constraints, ConstraintsLen))); +#endif } extern "C" void LLVMRustAppendModuleInlineAsm(LLVMModuleRef M, const char *Asm, |