diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-07-30 22:51:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-30 22:51:02 +0200 |
| commit | b9ad36c387405ddfd51bf9b245669cc71b55b9a6 (patch) | |
| tree | 0a3c4ce6c5ba489038930fab6ba5d467732e4d4b /compiler | |
| parent | 55258de97a6365dfd2b8b0b1bad77e9246e419b9 (diff) | |
| parent | eca274a1f92925ebcf0db0e2ff9ab03000fd6c4c (diff) | |
| download | rust-b9ad36c387405ddfd51bf9b245669cc71b55b9a6.tar.gz rust-b9ad36c387405ddfd51bf9b245669cc71b55b9a6.zip | |
Rollup merge of #99956 - est31:fix_llvm_wrapper_warning, r=cuviper
Also gate AllocatedPointer and AllocAlign definitions by LLVM_VERSION_GE
Fixes a warning:
```
warning: llvm-wrapper/RustWrapper.cpp:159:11: warning: enumeration values 'AllocatedPointer' and 'AllocAlign' not handled in switch [-Wswitch]
warning: switch (Kind) {
warning: ^
```
Which was fall out from 130a1df71ea73ab9d66d3cb8fc9cdb43155d514b.
Fixes #99955
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h b/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h index 93f302b44e8..015c1c52bef 100644 --- a/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h +++ b/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h @@ -87,8 +87,10 @@ enum LLVMRustAttribute { NoCfCheck = 35, ShadowCallStack = 36, AllocSize = 37, +#if LLVM_VERSION_GE(15, 0) AllocatedPointer = 38, AllocAlign = 39, +#endif }; typedef struct OpaqueRustString *RustStringRef; |