Fix macOS section handling that already have a comma in ther name #398
Conversation
This file contains 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
TheDan64
reviewed
Feb 8, 2023
| @@ -195,7 +202,7 @@ impl<'ctx> Value<'ctx> { | |||
| /// Sets the section of the global value | |||
| fn set_section(self, section: Option<&str>) { | |||
| #[cfg(target_os = "macos")] | |||
| let section = section.map(|s| format!(",{}", s)); | |||
| let section = section.map(|s| if s.contains(",") { format!("{}", s) } else { format!(",{}", s) }); | |||
There was a problem hiding this comment.
No. the idea is if a section name is just "mystuff", it needs to be set as ",mystuff", but if it's "XXX,mystuff", then don't touch it.
Section are expected to be in the format <segment name>,<section name>, and it seems a no segment-name is acceptable, that why the previous commit added the ",".
|
@TheDan64 is there any blocker for merging the PR? We would love to use it |
|
I can take a look at merging this and releasing a v0.1.1 this weekend |
TheDan64
approved these changes
Feb 11, 2023
|
Does this PR even build? This shadows "section" to be an Option instead of an Option<&str>, which can't be passed to to_c_str. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
Description
Following the commit #3917e32 section have a
,being added to their name on macOS. On some certain cases, that,should not be added because the name is already fully qualified, like__TEXT,wasmer_function.This PR check if section name already contains a comma before adding it.
Related Issue
address issue #396
How This Has Been Tested
Tested with latest Wasmer on macOS , both x86_64 and aarch64 arch.
Checklist