8000 Revert "Merge atomic counter inc/dec functions and use them consistently" by mshinwell · Pull Request #3781 · oxcaml/oxcaml · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Revert "Merge atomic counter inc/dec functions and use them consistently" #3781

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 2, 2025
Merged

Revert "Merge atomic counter inc/dec functions and use them consistently" #3781

merged 1 commit into from
Apr 2, 2025

Conversation

mshinwell
Copy link
Collaborator

Reverts #3644

This caused trouble in two ways:

  • some things looking for caml/atomic_refcount.h which has gone, this should be an easy fix
  • it seems like some code gets atomic_uintnat via the camlatomic.h include in misc.h, which has now gone.

cc @NickBarnes

@mshinwell mshinwell enabled auto-merge (squash) April 2, 2025 13:02
@mshinwell mshinwell requested a review from stedolan April 2, 2025 13:02
stedolan
stedolan approved these changes Apr 2, 2025
View reviewed changes
Copy link
Contributor
@stedolan stedolan left a comment

Choose a reason for hiding this comment

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

Approved as a temporary workaround until someone has time to fix the build problems it caused, but I'd like to get this patch back in soon.

@mshinwell mshinwell merged commit a3cd516 into main Apr 2, 2025
26 checks passed
@mshinwell mshinwell deleted the revert-3644-unify_atomics branch April 2, 2025 13:29
mshinwell added a commit that referenced this pull request Apr 2, 2025
@mshinwell
Revert "Merge atomic counter inc/dec functions and use them consisten…
7dbdd43 
…tly" (#3781)

Revert "Merge atomic counter inc/dec functions and use them consistently (#3644)"

This reverts commit f7e9aca.

(cherry picked from commit a3cd516)
@NickBarnes NickBarnes mentioned this pull request Apr 3, 2025
Open
gretay-js pushed a commit to gretay-js/flambda-backend that referenced this pull request Apr 21, 2025
@mshinwell @gretay-js
Revert "Merge atomic counter inc/dec functions and use them consisten…
dcd0d26 
…tly" (oxcaml#3781)

Revert "Merge atomic counter inc/dec functions and use them consistently (oxcaml#3644)"

This reverts commit f7e9aca.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stedolan stedolan stedolan approved these changes

Assignees
No one assigned
Labels
OCaml 5 runtime
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mshinwell @stedolan
0