Skip to content

Conversation

@udesou
Copy link
Contributor

@udesou udesou commented Feb 1, 2024

Upstream PR: mmtk/mmtk-core#1075
Julia PR: mmtk/julia#35

@udesou udesou added backport-v1.8.2+RAI Backport the change to the branch v1.8.2+RAI backport-v1.9.2+RAI Backport the change to the branch v1.9.2+RAI labels Feb 1, 2024
@udesou udesou requested a review from qinsoon February 2, 2024 01:42
Copy link
Member

@qinsoon qinsoon left a comment

Choose a reason for hiding this comment

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

LGTM. Loading jl_gc_disable_counter could be simpler -- see my comments for the line.

@qinsoon
Copy link
Member

qinsoon commented Feb 2, 2024

In terms of merging the PRs, you can merge the julia PR first, and update the Julia version in this PR. Then once the MMTk core PR is approved and merged, this PR will be updated to the new mmtk-core commit and will be auto merged.

@mmtkgc-bot mmtkgc-bot enabled auto-merge (squash) February 7, 2024 04:05
@mmtkgc-bot mmtkgc-bot merged commit eac7e88 into mmtk:master Feb 7, 2024
mergify bot pushed a commit that referenced this pull request Feb 7, 2024
Upstream PR: mmtk/mmtk-core#1075
Julia PR: mmtk/julia#35

---------

Co-authored-by: mmtkgc-bot <[email protected]>
(cherry picked from commit eac7e88)

# Conflicts:
#	mmtk/Cargo.lock
#	mmtk/Cargo.toml
#	mmtk/api/mmtk.h
#	mmtk/src/api.rs
#	mmtk/src/collection.rs
mergify bot pushed a commit that referenced this pull request Feb 7, 2024
Upstream PR: mmtk/mmtk-core#1075
Julia PR: mmtk/julia#35

---------

Co-authored-by: mmtkgc-bot <[email protected]>
(cherry picked from commit eac7e88)

# Conflicts:
#	mmtk/Cargo.lock
#	mmtk/Cargo.toml
#	mmtk/src/collection.rs
udesou added a commit that referenced this pull request Feb 9, 2024
This is an automatic backport of pull request #126 done by
[Mergify](https://mergify.com).
Cherry-pick of eac7e88 has failed:
```
On branch mergify/bp/v1.9.2+RAI/pr-126
Your branch is up to date with 'origin/v1.9.2+RAI'.

You are currently cherry-picking commit eac7e88.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mmtk/Cargo.lock
	both modified:   mmtk/Cargo.toml
	both modified:   mmtk/src/collection.rs

no changes added to commit (use "git add" and/or "git commit -a")
```


To fix up this pull request, you can check it out locally. See
documentation:
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the
[documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on
`<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you
can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>

---------

Co-authored-by: Eduardo Souza <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-v1.8.2+RAI Backport the change to the branch v1.8.2+RAI backport-v1.9.2+RAI Backport the change to the branch v1.9.2+RAI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants