diff options
| author | bors <bors@rust-lang.org> | 2020-03-08 19:54:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-08 19:54:57 +0000 |
| commit | 2cb0b8582ebbf9784db9cec06fff517badbf4553 (patch) | |
| tree | e9d43ec6f39de515bf629881b438fcd8db31b0af /src/rustllvm/RustWrapper.cpp | |
| parent | 564758c4c329e89722454dd2fbb35f1ac0b8b47c (diff) | |
| parent | c934c94212755eee25e86d9d49fb057073a28b91 (diff) | |
| download | rust-2cb0b8582ebbf9784db9cec06fff517badbf4553.tar.gz rust-2cb0b8582ebbf9784db9cec06fff517badbf4553.zip | |
Auto merge of #69833 - Centril:rollup-mh74yue, r=Centril
Rollup of 7 pull requests Successful merges: - #69120 (Don't give invalid suggestion on desugared span.) - #69326 (mir-interpret: add method to read wide strings from Memory) - #69608 (Expose target libdir information via print command) - #69734 (Change DIBuilderCreateEnumerator signature to match LLVM 9) - #69800 (Compile address sanitizer test with debuginfo) - #69807 (Cleanup E0391 explanation) - #69820 (clean up E0392 explanation) Failed merges: r? @ghost
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 49b6e1bfec3..0e430d3881e 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -891,10 +891,10 @@ extern "C" LLVMValueRef LLVMRustDIBuilderInsertDeclareAtEnd( unwrap(InsertAtEnd))); } -extern "C" LLVMMetadataRef -LLVMRustDIBuilderCreateEnumerator(LLVMRustDIBuilderRef Builder, - const char *Name, uint64_t Val) { - return wrap(Builder->createEnumerator(Name, Val)); +extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerator( + LLVMRustDIBuilderRef Builder, const char *Name, size_t NameLen, + int64_t Value, bool IsUnsigned) { + return wrap(Builder->createEnumerator({Name, NameLen}, Value, IsUnsigned)); } extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerationType( |