diff options
| author | bors <bors@rust-lang.org> | 2020-10-29 20:56:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-29 20:56:25 +0000 |
| commit | a3d7a5e94507e3d6618790187bd85250ced82c4f (patch) | |
| tree | 822ba7acb43ce58660c3c75fe4e6a6fa9ada56bc /compiler/rustc_llvm/llvm-wrapper | |
| parent | 6bdae9edd0cc099daa6038bca469dc09b6fc078a (diff) | |
| parent | e656e609ba8794997d466f764d83374de61b8eea (diff) | |
| download | rust-a3d7a5e94507e3d6618790187bd85250ced82c4f.tar.gz rust-a3d7a5e94507e3d6618790187bd85250ced82c4f.zip | |
Auto merge of #78528 - jonas-schievink:rollup-e70g9zk, r=jonas-schievink
Rollup of 11 pull requests
Successful merges:
- #75078 (Improve documentation for slice strip_* functions)
- #76138 (Explain fully qualified syntax for `Rc` and `Arc`)
- #78244 (Dogfood {exclusive,half-open} ranges in compiler (nfc))
- #78422 (Do not ICE on invalid input)
- #78423 (rustc_span: improve bounds checks in byte_pos_to_line_and_col)
- #78431 (Prefer new associated numeric consts in float error messages)
- #78462 (Use unwrapDIPtr because the Scope may be null.)
- #78493 (Update cargo)
- #78499 (Prevent String::retain from creating non-utf8 strings when abusing panic)
- #78505 (Update Clippy - temporary_cstring_as_ptr deprecation)
- #78527 (Fix some more typos)
Failed merges:
r? `@ghost`
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper')
| -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 3beb328339e..869aaa569ca 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -766,7 +766,7 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateTypedef( LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Scope) { return wrap(Builder->createTypedef( unwrap<DIType>(Type), StringRef(Name, NameLen), unwrap<DIFile>(File), - LineNo, unwrap<DIScope>(Scope))); + LineNo, unwrapDIPtr<DIScope>(Scope))); } extern "C" LLVMMetadataRef LLVMRustDIBuilderCreatePointerType( |