diff options
| author | bors <bors@rust-lang.org> | 2024-02-07 00:03:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-07 00:03:50 +0000 |
| commit | 586893c7b0adabf5f0a4c155fd86e13cf470e74b (patch) | |
| tree | 7ccc482fdb1247a50693fa04a614375452d7d7d4 /compiler/rustc_llvm/llvm-wrapper | |
| parent | 256b6fb19a2c018eaad4806d2369d1f6a71fc6ec (diff) | |
| parent | 84114fea9e3270773b474e3d5534d5ff732db139 (diff) | |
| download | rust-586893c7b0adabf5f0a4c155fd86e13cf470e74b.tar.gz rust-586893c7b0adabf5f0a4c155fd86e13cf470e74b.zip | |
Auto merge of #120722 - matthiaskrgr:rollup-9o32280, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #119939 (Improve 'generic param from outer item' error for `Self` and inside `static`/`const` items) - #120331 (pattern_analysis: use a plain `Vec` in `DeconstructedPat`) - #120396 (Account for unbounded type param receiver in suggestions) - #120423 (update indirect structural match lints to match RFC and to show up for dependencies) - #120435 (Suggest name value cfg when only value is used for check-cfg) - #120502 (Remove `ffi_returns_twice` feature) - #120507 (Account for non-overlapping unmet trait bounds in suggestion) - #120513 (Normalize type outlives obligations in NLL for new solver) - #120707 (Don't expect early-bound region to be local when reporting errors in RPITIT well-formedness) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h | 1 | ||||
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h b/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h index 5bfffc5d911..6d578c97f3f 100644 --- a/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h +++ b/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h @@ -76,7 +76,6 @@ enum LLVMRustAttribute { SanitizeMemory = 22, NonLazyBind = 23, OptimizeNone = 24, - ReturnsTwice = 25, ReadNone = 26, SanitizeHWAddress = 28, WillReturn = 29, diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index 0df7b7eed11..a2dfebec594 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -250,8 +250,6 @@ static Attribute::AttrKind fromRust(LLVMRustAttribute Kind) { return Attribute::NonLazyBind; case OptimizeNone: return Attribute::OptimizeNone; - case ReturnsTwice: - return Attribute::ReturnsTwice; case ReadNone: return Attribute::ReadNone; case SanitizeHWAddress: |