diff options
| author | bors <bors@rust-lang.org> | 2022-02-15 16:48:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-15 16:48:26 +0000 |
| commit | 6bf3008f0757c7c89c3f02e0e7eaac5ee30c1c6c (patch) | |
| tree | a7a234b7a8a29df52935d01d839313636e3960bc /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | 55697574915ca58c3fcd7b1c854c1c93e002dc85 (diff) | |
| parent | cc836ee292188da1c0c29e369fada75606bfb74c (diff) | |
| download | rust-6bf3008f0757c7c89c3f02e0e7eaac5ee30c1c6c.tar.gz rust-6bf3008f0757c7c89c3f02e0e7eaac5ee30c1c6c.zip | |
Auto merge of #94024 - matthiaskrgr:rollup-0hwxm0w, r=matthiaskrgr
Rollup of 5 pull requests
Successful merges:
- #93899 (Describe VecDeque with more consistent names)
- #93949 (Add basic platform support to library/{panic_}unwind for m68k)
- #93999 (suggest using raw strings when invalid escapes appear in literals)
- #94001 (llvm: migrate to new parameter-bearing uwtable attr)
- #94014 (Move transmute_undefined_repr back to nursery)
Failed merges:
- #94020 (Support pretty printing of invalid constants)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index fb9c5e6a527..23333199506 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -334,6 +334,17 @@ extern "C" void LLVMRustAddStructRetAttr(LLVMValueRef Fn, unsigned Index, AddAttribute(F, Index, Attr); } +extern "C" void LLVMRustEmitUWTableAttr(LLVMValueRef Fn, bool Async) { + Function *F = unwrap<Function>(Fn); +#if LLVM_VERSION_LT(15, 0) + Attribute Attr = Attribute::get(F->getContext(), Attribute::UWTable); +#else + Attribute Attr = Attribute::getWithUWTableKind( + F->getContext(), Async ? UWTableKind::Async : UWTableKind::Sync); +#endif + AddAttribute(F, AttributeList::AttrIndex::FunctionIndex, Attr); +} + extern "C" void LLVMRustAddFunctionAttrStringValue(LLVMValueRef Fn, unsigned Index, const char *Name, |
