Skip to content
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

Merged
merged 2 commits into from
Dec 14, 2022

Conversation

alex
Copy link
Member

@alex alex commented Dec 3, 2022

r? @bjorn3

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 3, 2022
if let Some(new_archive) = try_extract_macho_fat_archive(&self.sess, &archive)? {
archive = new_archive
}
}
Copy link
Member

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?

Copy link
Member Author

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.

Copy link
Member

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.

Copy link
Member Author

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)>> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit LGTM.

@alex alex force-pushed the fat-archive-cleanup branch from cf81b53 to bd8e476 Compare December 3, 2022 19:02
@bjorn3
Copy link
Member

bjorn3 commented Dec 13, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Dec 13, 2022

📌 Commit bd8e476 has been approved by bjorn3

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 13, 2022
@bors
Copy link
Contributor

bors commented Dec 14, 2022

⌛ Testing commit bd8e476 with merge dc30b92...

@bors
Copy link
Contributor

bors commented Dec 14, 2022

☀️ Test successful - checks-actions
Approved by: bjorn3
Pushing dc30b92 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 14, 2022
@bors bors merged commit dc30b92 into rust-lang:master Dec 14, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 14, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (dc30b92): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This 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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.7% [-1.7%, -1.7%] 1
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

@alex alex deleted the fat-archive-cleanup branch December 14, 2022 11:34
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
Avoid a temporary file when processing macOS fat archives

r? `@bjorn3`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 28, 2023
…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
bors added a commit to rust-lang/miri that referenced this pull request Jan 31, 2023
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants