Skip to content

Replace sys/unix/weak AtomicUsize with AtomicPtr - #96167

Merged
bors merged 1 commit into
rust-lang:masterfrom
CAD97:weak-dlsym-less-ptr-crime
Apr 20, 2022
Merged

Replace sys/unix/weak AtomicUsize with AtomicPtr#96167
bors merged 1 commit into
rust-lang:masterfrom
CAD97:weak-dlsym-less-ptr-crime

Conversation

@CAD97

@CAD97CAD97 commented Apr 18, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

Should fix#96163. Can't easily test on Windows though...

@rustbotrustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Apr 18, 2022
@rust-highfive

rust-highfive commented Apr 18, 2022

Copy link
Copy Markdown
Contributor

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with r? rust-lang/libs-api @rustbot label +T-libs-api -T-libs to request review from a libs-api team reviewer. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rust-highfive

rust-highfive commented Apr 18, 2022

Copy link
Copy Markdown
Contributor

r? @kennytm

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 18, 2022
@CAD97

CAD97 commented Apr 18, 2022

Copy link
Copy Markdown
ContributorAuthor

cc @lopopolo

@CAD97
CAD97force-pushed the weak-dlsym-less-ptr-crime branch 2 times, most recently from d8281d2 to 0f4b060CompareApril 18, 2022 04:30
@CAD97
CAD97force-pushed the weak-dlsym-less-ptr-crime branch from 0f4b060 to 620c0a4CompareApril 18, 2022 04:34
@thomcc

thomcc commented Apr 19, 2022

Copy link
Copy Markdown
Member

This looks fine to me, and I have familiarity with the area (having rewrote several of these functions before). https://std-dev-guide.rust-lang.org/reviewing.html indicates that I can just r+ it. I am assuming if the assigned reviewer wanted to review it, they'd have gotten to it by now, hopefully this is not out of line.

This also is an annoying issue because it causes HashMap not to be usable in miri (under certain settings) on macOS, so it would be good to fix (e.g. I'd personally like it fixed).

@bors r+

@bors

bors commented Apr 19, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 620c0a4 has been approved by thomcc

@borsbors 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 Apr 19, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 20, 2022
@Dylan-DPC
Rollup merge ofrust-lang#96167- CAD97:weak-dlsym-less-ptr-crime, r=…
c785dec
…thomcc
Replace sys/unix/weak AtomicUsize with AtomicPtr
Should fixrust-lang#96163. Can't easily test on Windows though...
@Dylan-DPCDylan-DPC mentioned this pull request Apr 20, 2022
Closed
@Dylan-DPCDylan-DPC mentioned this pull request Apr 20, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 20, 2022
@bors
Auto merge ofrust-lang#96253- Dylan-DPC:rollup-87hpds5, r=Dylan-DPC
51ea9bb
Rollup of 6 pull requests
Successful merges:
- rust-lang#93313 (Check if call return type is visibly uninhabited when building MIR)
- rust-lang#96160 (Miri/interpreter debugging tweaks)
- rust-lang#96167 (Replace sys/unix/weak AtomicUsize with AtomicPtr)
- rust-lang#96168 (Improve AddrParseError description)
- rust-lang#96206 (Use sys::unix::locks::futex* on wasm+atomics.)
- rust-lang#96234 (remove_dir_all_recursive: treat ELOOP the same as ENOTDIR)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 53f028d into rust-lang:masterApr 20, 2022
@rustbotrustbot added this to the 1.62.0 milestone Apr 20, 2022
@CAD97
CAD97 deleted the weak-dlsym-less-ptr-crime branch April 20, 2022 21:06
@lopopololopopolo mentioned this pull request Apr 23, 2022
Closed
@nvzqznvzqz mentioned this pull request Jun 6, 2022
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@kennytmkennytm

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.62.0

Development

Successfully merging this pull request may close these issues.

Miri with strict provenance flags UB in macos impl of hashmap_random_keys

6 participants

@CAD97@rust-highfive@thomcc@bors@kennytm@rustbot