Migrate to LLVM{Get,Set}ValueName2 #67033
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The deprecated `LLVM{Get,Set}ValueName` only work with NUL-terminated
strings, but the `2` variants use explicit lengths, which fits better
with Rust strings and slices. We now use these in new helper functions
`llvm::{get,set}_value_name` that convert to/from `&[u8]`.
rust-highfive
added
the
S-waiting-on-review
cuviper
commented
Dec 4, 2019
| @@ -774,7 +774,8 @@ extern "C" { | |||
| pub fn LLVMIsAGlobalVariable(GlobalVar: &Value) -> Option<&Value>; | |||
| pub fn LLVMAddGlobal(M: &'a Module, Ty: &'a Type, Name: *const c_char) -> &'a Value; | |||
| pub fn LLVMGetNamedGlobal(M: &Module, Name: *const c_char) -> Option<&Value>; | |||
| pub fn LLVMRustGetOrInsertGlobal(M: &'a Module, Name: *const c_char, T: &'a Type) -> &'a Value; | |||
| pub fn LLVMRustGetOrInsertGlobal(M: &'a Module, Name: *const c_char, NameLen: size_t, | |||
| T: &'a Type) -> &'a Value; | |||
There was a problem hiding this comment.
FWIW, I think there's an opportunity to convert a lot more of these LLVMRust wrappers to pointer+len strings, using StringRef on the actual C++ LLVM call, but for now I only changed a couple that were involved with the ValueName calls.
There was a problem hiding this comment.
Agreed. I also wouldn't object if you did the rest too but it's not necessary.
There was a problem hiding this comment.
I'll probably work on those incrementally, in separate PRs.
|
Thanks! @bors r+ |
|
📌 Commit 16d2178 has been approved by |
bors
added
S-waiting-on-bors
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Dec 6, 2019
Migrate to LLVM{Get,Set}ValueName2
The deprecated `LLVM{Get,Set}ValueName` only work with NUL-terminated
strings, but the `2` variants use explicit lengths, which fits better
with Rust strings and slices. We now use these in new helper functions
`llvm::{get,set}_value_name` that convert to/from `&[u8]`.
Closes rust-lang#64223.
r? @rkruppe
bors
added a commit
that referenced
this pull request
Dec 6, 2019
Rollup of 11 pull requests Successful merges: - #66846 (Make try_mark_previous_green aware of cycles.) - #66959 (Remove potential cfgs duplicates) - #66988 (Fix angle bracket formatting when dumping MIR debug vars) - #66998 (Modified the testcases for VxWorks) - #67008 (rustdoc: Add test for fixed issue) - #67023 (SGX: Fix target linker used by bootstrap) - #67033 (Migrate to LLVM{Get,Set}ValueName2) - #67049 (Simplify {IoSlice, IoSliceMut}::advance examples and tests) - #67054 (codegen "unreachable" for invalid SetDiscriminant) - #67081 (Fix Query type docs) - #67085 (Remove boxed closures in address parser.) Failed merges: r? @ghost
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The deprecated
LLVM{Get,Set}ValueNameonly work with NUL-terminatedstrings, but the
2variants use explicit lengths, which fits betterwith Rust strings and slices. We now use these in new helper functions
llvm::{get,set}_value_namethat convert to/from&[u8].Closes #64223.
r? @rkruppe