diff options
| author | bors <bors@rust-lang.org> | 2022-07-18 20:39:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-18 20:39:24 +0000 |
| commit | f8588549c3c3d45c32b404210cada01e2a45def3 (patch) | |
| tree | 8ecfb39070ceb44e57a2070e9653e41cfd255242 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | ed9173276a176126150b4c684a4262a135ce51ef (diff) | |
| parent | 068a559fbbe7e0e018b66e8798295ca4f97236b5 (diff) | |
| download | rust-f8588549c3c3d45c32b404210cada01e2a45def3.tar.gz rust-f8588549c3c3d45c32b404210cada01e2a45def3.zip | |
Auto merge of #99422 - Dylan-DPC:rollup-htjofm6, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #98839 (Add assertion that `transmute_copy`'s U is not larger than T) - #98998 (Remove branch target prologues from `#[naked] fn`) - #99198 (add missing null ptr check in alloc example) - #99344 (rustdoc: avoid inlining items with duplicate `(type, name)`) - #99351 (Use `typeck_results` to get accurate qpath res for arg mismatch error) - #99378 (interpret/visitor: add missing early return) - #99394 (Add regression test for #95230) Failed merges: 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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index 7ac3157e7a1..2d35ee8976e 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -176,6 +176,8 @@ static Attribute::AttrKind fromRust(LLVMRustAttribute Kind) { return Attribute::NoAlias; case NoCapture: return Attribute::NoCapture; + case NoCfCheck: + return Attribute::NoCfCheck; case NoInline: return Attribute::NoInline; case NonNull: |