diff options
| author | bors <bors@rust-lang.org> | 2022-09-27 22:41:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-27 22:41:47 +0000 |
| commit | 90c34fafcfa1d00ae25a165dc006e688761a5776 (patch) | |
| tree | f954e73e2a2919ad277b97be0a9ea0d2b67f292c /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | 470e518c4b43265020c882bcf3c86632f5494910 (diff) | |
| parent | f28ac30527b423d01f762bbf93aec0c6bd1adf52 (diff) | |
| download | rust-90c34fafcfa1d00ae25a165dc006e688761a5776.tar.gz rust-90c34fafcfa1d00ae25a165dc006e688761a5776.zip | |
Auto merge of #102377 - matthiaskrgr:rollup-1zvj50t, r=matthiaskrgr
Rollup of 9 pull requests
Successful merges:
- #101555 (Stabilize `#![feature(mixed_integer_ops)]`)
- #102253 (rustdoc: use CSS containment to speed up render)
- #102281 (make invalid_value lint a bit smarter around enums)
- #102284 (Structured suggestion for missing `mut`/`const` in raw pointer)
- #102330 (rustdoc: remove no-op CSS `.srclink { font-weight; font-size }`)
- #102337 (Avoid LLVM-deprecated `Optional::hasValue`)
- #102356 (session: remove now-unnecessary lint `#[allow]`s)
- #102367 (rustdoc: remove redundant `#help-button` CSS)
- #102369 (Fix search result colors)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp index 09f377d349f..879a3b660b4 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -1044,7 +1044,7 @@ extern "C" void LLVMRustSetModulePIELevel(LLVMModuleRef M) { extern "C" void LLVMRustSetModuleCodeModel(LLVMModuleRef M, LLVMRustCodeModel Model) { auto CM = fromRust(Model); - if (!CM.hasValue()) + if (!CM) return; unwrap(M)->setCodeModel(*CM); } |