diff options
| author | bors <bors@rust-lang.org> | 2022-11-15 06:43:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-15 06:43:28 +0000 |
| commit | ca92d90b5917e7176d5ff06607a2cd5352c088d3 (patch) | |
| tree | b34e3c368642c150f3c81bc98d45d57353480bbc /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | 101e1822c3e54e63996c8aaa014d55716f3937eb (diff) | |
| parent | 7c7cb7182f8b2211005d3f82126e5f45e270ad21 (diff) | |
| download | rust-ca92d90b5917e7176d5ff06607a2cd5352c088d3.tar.gz rust-ca92d90b5917e7176d5ff06607a2cd5352c088d3.zip | |
Auto merge of #104428 - matthiaskrgr:rollup-jo3078i, r=matthiaskrgr
Rollup of 13 pull requests
Successful merges:
- #103842 (Adding Fuchsia compiler testing script, docs)
- #104354 (Remove leading newlines from `NonZero*` doc examples)
- #104372 (Update compiler-builtins)
- #104380 (rustdoc: remove unused CSS `code { opacity: 1 }`)
- #104381 (Remove dead NoneError diagnostic handling)
- #104383 (Remove unused symbols and diagnostic items)
- #104391 (Deriving cleanups)
- #104403 (Specify language of code comment to generate document)
- #104404 (Fix missing minification for static files)
- #104413 ([llvm-wrapper] adapt for LLVM API change)
- #104415 (rustdoc: fix corner case in search keyboard commands)
- #104422 (Fix suggest associated call syntax)
- #104426 (Add test for #102154)
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, 1 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index 0d9b5a57b69..85c520a7911 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -9,7 +9,7 @@ #include "llvm/IR/IntrinsicsARM.h" #include "llvm/IR/Mangler.h" #if LLVM_VERSION_GE(16, 0) -#include "llvm/IR/ModRef.h" +#include "llvm/Support/ModRef.h" #endif #include "llvm/Object/Archive.h" #include "llvm/Object/COFFImportFile.h" |