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

Fix GetGenerationBounds under USE_REGIONS #57101

Merged
merged 9 commits into from
Aug 27, 2021

Conversation

cshung
Copy link
Member

@cshung cshung commented Aug 9, 2021

Fixes #55965.

@ghost
Copy link

ghost commented Aug 9, 2021

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

Issue Details

Do not merge, this is currently a work-in-progress.

Author: cshung
Assignees: -
Labels:

area-GC-coreclr

Milestone: -

@cshung cshung changed the title [WIP] Fix GetGenerationBounds under USE_REGIONS Fix GetGenerationBounds under USE_REGIONS Aug 21, 2021
@cshung cshung requested review from Maoni0 and davmason August 21, 2021 01:54
src/coreclr/gc/gc.cpp Outdated Show resolved Hide resolved
src/coreclr/gc/gc.cpp Outdated Show resolved Hide resolved
src/coreclr/gc/gc.cpp Outdated Show resolved Hide resolved
@Maoni0
Copy link
Member

Maoni0 commented Aug 25, 2021

I haven't really looked at the changes in proftoeeinterfaceimpl.cpp, I'll defer to @davmason.

@cshung cshung force-pushed the private/regions-profiler branch 2 times, most recently from e832f3d to 365a2f2 Compare August 25, 2021 15:56
Copy link
Member

@davmason davmason left a comment

Choose a reason for hiding this comment

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

Just the minor things I made comments on, otherwise looks good to me. Thanks Andrew!

src/coreclr/vm/proftoeeinterfaceimpl.cpp Show resolved Hide resolved
src/coreclr/gc/gc.cpp Outdated Show resolved Hide resolved
@cshung cshung merged commit a18bb6c into dotnet:main Aug 27, 2021
@cshung cshung deleted the private/regions-profiler branch August 27, 2021 16:26
@cshung
Copy link
Member Author

cshung commented Aug 27, 2021

/backport to release/6.0

@github-actions
Copy link
Contributor

Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/1174937983

@github-actions
Copy link
Contributor

@cshung backporting to release/6.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: DiagAddNewRegion prototype
Applying: Updating the table directly under a lock
error: sha1 information is lacking or useless (src/coreclr/gc/gc.cpp).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Updating the table directly under a lock
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

cshung added a commit to cshung/runtime that referenced this pull request Aug 27, 2021
@ghost ghost locked as resolved and limited conversation to collaborators Sep 26, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Regions] pCorProfilerInfo->GetObjectGeneration may fail when running under USE_REGIONS
4 participants