diff options
| author | bors <bors@rust-lang.org> | 2022-04-29 22:27:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-29 22:27:10 +0000 |
| commit | 05c07386b45fbc540ec8cdc1bc41ae9c062b453b (patch) | |
| tree | 9026685f1048d847cd7af1f5b97cea3e33d3f5c1 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | a707f401074bc769bab4efb2bfdde7f6c5a4068d (diff) | |
| parent | 548fca6927a644b4cde66893f5db6f4aff3f8f33 (diff) | |
| download | rust-05c07386b45fbc540ec8cdc1bc41ae9c062b453b.tar.gz rust-05c07386b45fbc540ec8cdc1bc41ae9c062b453b.zip | |
Auto merge of #96566 - Dylan-DPC:rollup-fo7rd98, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #96390 (Switch JS code to ES6 - part 2) - #96527 (RustWrapper: explicitly don't handle DXILPointerTyID) - #96536 (rustdoc: fix missing method list for primitive deref target) - #96559 (Use the correct lifetime binder for elided lifetimes in path.) - #96560 (Remove unnecessary environment variable in cf-protection documentation) - #96562 (Fix duplicate directory separator in --remap-path-prefix.) 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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index 850b80e4280..6d79e662a42 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -1217,6 +1217,11 @@ extern "C" LLVMTypeKind LLVMRustGetTypeKind(LLVMTypeRef Ty) { return LLVMBFloatTypeKind; case Type::X86_AMXTyID: return LLVMX86_AMXTypeKind; +#if LLVM_VERSION_GE(15, 0) + case Type::DXILPointerTyID: + report_fatal_error("Rust does not support DirectX typed pointers."); + break; +#endif } report_fatal_error("Unhandled TypeID."); } |