Skip to content

Conversation

@alhad-deshpande
Copy link
Contributor

@alhad-deshpande alhad-deshpande commented Aug 29, 2022

This PR fixes below 2 github issues:

  1. Stack unwinding segmentation fault occurring in System.Runtime.Tests, fixed 74069
  2. Conditional branching g_assert occurring in PCR2 tests74057

Fixes #74069
Fixes #74057

@ghost ghost added area-VM-meta-mono community-contribution Indicates that the PR has been added by a community member labels Aug 29, 2022
@alhad-deshpande
Copy link
Contributor Author

@vargaz @akoeplinger
This PR is intended for RC1 release. Hence request to you please merge it in RC1 branch as well.

@akoeplinger
Copy link
Member

/azp run runtime-community

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@akoeplinger
Copy link
Member

akoeplinger commented Aug 29, 2022

@alhad-deshpande as far as I know it's too late for RC1 but I can backport it to RC2 (@vargaz is on vacation).

@alhad-deshpande
Copy link
Contributor Author

@akoeplinger
Yes, please backport it to RC2.

@akoeplinger
Copy link
Member

@alhad-deshpande there are some test failures for PPC64 in https://dev.azure.com/dnceng/public/_build/results?buildId=1973269&view=logs&j=13a47023-c67b-5350-920c-f75d7d69650d&t=54de2c5f-c9e1-522b-3533-a199af7b864d, could you please take a look and check they're not related?

@Sapana-Khemkar
Copy link
Contributor

@akoeplinger
Link which you have shared, build started at 2pm.
If I go through link https://dev.azure.com/dnceng/public/_build/results?buildId=1973496&view=logs&j=13a47023-c67b-5350-920c-f75d7d69650d&t=54de2c5f-c9e1-522b-3533-a199af7b864d. It is result after @alhad-deshpande has raised PR.
And as per logs on this link both issues mentioned in PR has been fixed.
Can you please check logs again?

@akoeplinger
Copy link
Member

@Sapana-Khemkar yeah I retried the job and now it just fails in System.Runtime.Serialization.Formatters.Tests which I assume is a different issue. Are you planning on looking at that soon too, i.e. should we wait with the backport until that one is fixed too?

@akoeplinger akoeplinger merged commit b11d401 into dotnet:main Aug 29, 2022
@janani66
Copy link

@akoeplinger The timeout seen in System.Runtime.Serialization.Formatters.Tests is different and we don't see it on our machines. So not sure if that is a resource issue on the machines you'll have. Nutshell -- please merge these changes as it fixes the main issues we were working on

@akoeplinger
Copy link
Member

/backport to release/7.0

@github-actions
Copy link
Contributor

Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/2950215241

@github-actions
Copy link
Contributor

@akoeplinger backporting to release/7.0 failed, the patch most likely resulted in conflicts:

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

Applying: Avoid transformation from multiplication to left shift in case of 64 bit value
Using index info to reconstruct a base tree...
M	src/coreclr/pal/src/misc/perfjitdump.cpp
M	src/mono/mono/mini/local-propagation.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/local-propagation.c
No changes -- Patch already applied.
Applying: Fixed System.Collections.Concurrent.Tests timeout issue
Using index info to reconstruct a base tree...
M	src/mono/mono/mini/cpu-ppc.mdesc
M	src/mono/mono/mini/cpu-ppc64.mdesc
M	src/mono/mono/mini/mini-ppc.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/mini-ppc.c
CONFLICT (content): Merge conflict in src/mono/mono/mini/mini-ppc.c
Auto-merging src/mono/mono/mini/cpu-ppc64.mdesc
CONFLICT (content): Merge conflict in src/mono/mono/mini/cpu-ppc64.mdesc
Auto-merging src/mono/mono/mini/cpu-ppc.mdesc
CONFLICT (content): Merge conflict in src/mono/mono/mini/cpu-ppc.mdesc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Fixed System.Collections.Concurrent.Tests timeout issue
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!

@janani66
Copy link

Ok , will port it manually

@ghost ghost locked as resolved and limited conversation to collaborators Sep 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-VM-meta-mono community-contribution Indicates that the PR has been added by a community member

Projects

None yet

5 participants