-
Notifications
You must be signed in to change notification settings - Fork 12.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Avoid a temporary file when processing macOS fat archives #105221
Conversation
its only ever used for wasm targets
if let Some(new_archive) = try_extract_macho_fat_archive(&self.sess, &archive)? { | ||
archive = new_archive | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should keep this for now in case we need to revert back from the rust rewrite to the original version on macOS due to a bug in the rust rewrite?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The LlvmArchiveWriter doesn't have a clean place to add this -- it doesn't track file_range, it just has a path.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see. Would you mind waiting a week or so to make sure no issues pop up? r=me after that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, that's fine
archive_map_data: &[u8], | ||
) -> io::Result<Option<PathBuf>> { | ||
archive_map_data: &'a [u8], | ||
) -> io::Result<Option<(&'a [u8], u64)>> { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This commit LGTM.
cf81b53
to
bd8e476
Compare
@bors r+ |
☀️ Test successful - checks-actions |
Finished benchmarking commit (dc30b92): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. |
Avoid a temporary file when processing macOS fat archives r? `@bjorn3`
…esleywiser Fix thin archive reading This includes a revert of rust-lang#105221 to restore fat archive reading with LlvmArchiveBuilder. Should fix rust-lang#107162, rust-lang#107334 and google/shaderc-rs#133
Fix thin archive reading This includes a revert of rust-lang/rust#105221 to restore fat archive reading with LlvmArchiveBuilder. Should fix #107162, #107334 and google/shaderc-rs#133
r? @bjorn3