Skip to content

Revert "[release/9.0] Fix edge cases in Tarjan GC bridge (Android)" #114641

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

Merged
merged 1 commit into from
Apr 14, 2025

Conversation

steveisok
Copy link
Member

Reverts #114391

I think due to the assertion #114637 is fixing, we revert for now and let main run with the bridge change. I would be ok bringing this back up for servicing next month.

@Copilot Copilot AI review requested due to automatic review settings April 14, 2025 17:47
@ghost ghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Apr 14, 2025
@steveisok steveisok requested review from vitek-karas and removed request for lambdageek April 14, 2025 17:47
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Copilot reviewed 4 out of 6 changed files in this pull request and generated 1 comment.

Files not reviewed (2)
  • src/tests/GC/Features/Bridge/Bridge.csproj: Language not supported
  • src/tests/GC/Features/Bridge/BridgeTester.csproj: Language not supported
Comments suppressed due to low confidence (2)

src/tests/GC/Features/Bridge/BridgeTester.cs:1

  • The removal of BridgeTester.cs may reduce test coverage for the GC bridge functionality. Please verify that adequate tests exist elsewhere to validate this behavior.
File removed (BridgeTester.cs)

src/mono/mono/metadata/sgen-tarjan-bridge.c:792

  • Replacing 'new_color(FALSE)' with 'reduce_color()' in the non-bridge branch changes the logic for creating a new color. Verify that this change is intentional and that it does not adversely affect the SCC formation behavior.
color_data = reduce_color ();

@steveisok
Copy link
Member Author

@carlossanlop ideally this should get in before you branch for servicing.

@carlossanlop carlossanlop added os-android area-GC-mono and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Apr 14, 2025
Copy link
Contributor

Tagging subscribers to this area: @BrzVlad
See info in area-owners.md if you want to be subscribed.

@carlossanlop
Copy link
Contributor

Since the original PR was merged on Apr 8 (in other words, it hasn't been released yet), this can be marked as servicing-approved and get merged as soon as the CI looks good.

There's a GitHub Copilot review comment. Is that something you want to take or was it an incorrect suggestion?

cc @filipnavara

@steveisok steveisok added the Servicing-approved Approved for servicing release label Apr 14, 2025
@filipnavara
Copy link
Member

There's a GitHub Copilot review comment. Is that something you want to take or was it an incorrect suggestion?

The suggestion is reverting the revert... in other words, NO. :) It will be fixed once this is resubmitted for next servicing release.

@matouskozak
Copy link
Member

fyi: this could possily fix the CI crashes we're seeing #114631

@steveisok
Copy link
Member Author

/ba-g Wasm restarts

@steveisok steveisok merged commit 39bae29 into release/9.0-staging Apr 14, 2025
124 of 135 checks passed
@steveisok steveisok deleted the revert-114391-9.0-gcbridge branch April 14, 2025 22:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants