diff options
| author | bors <bors@rust-lang.org> | 2022-08-04 21:03:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-04 21:03:48 +0000 |
| commit | f6f9d5e73d5524b6281c10a5c89b7db35c330634 (patch) | |
| tree | a3af49ccf1294aaed6508bbb1b9d57b4c0aaa722 /compiler/rustc_llvm | |
| parent | 3830ecaa8db798d2727cbdfa4ddf314ff938f268 (diff) | |
| parent | c2d7321a2dc898bc23c37a9322c5318c767c35db (diff) | |
| download | rust-f6f9d5e73d5524b6281c10a5c89b7db35c330634.tar.gz rust-f6f9d5e73d5524b6281c10a5c89b7db35c330634.zip | |
Auto merge of #100151 - matthiaskrgr:rollup-irqwvj2, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #98796 (Do not exclusively suggest `;` when `,` is also a choice) - #99772 (Re-enable submodule archive downloads.) - #100058 (Suggest a positional formatting argument instead of a captured argument) - #100093 (Enable unused_parens for match arms) - #100095 (More EarlyBinder cleanups) - #100138 (Remove more Clean trait implementations) - #100148 (RustWrapper: update for TypedPointerType in LLVM) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index c333738ded4..5f5b5de790e 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -1311,11 +1311,16 @@ extern "C" LLVMTypeKind LLVMRustGetTypeKind(LLVMTypeRef Ty) { return LLVMBFloatTypeKind; case Type::X86_AMXTyID: return LLVMX86_AMXTypeKind; -#if LLVM_VERSION_GE(15, 0) +#if LLVM_VERSION_GE(15, 0) && LLVM_VERSION_LT(16, 0) case Type::DXILPointerTyID: report_fatal_error("Rust does not support DirectX typed pointers."); break; #endif +#if LLVM_VERSION_GE(16, 0) + case Type::TypedPointerTyID: + report_fatal_error("Rust does not support typed pointers."); + break; +#endif } report_fatal_error("Unhandled TypeID."); } |