Skip to content

[Mono] Fix offset calculation for nested struct, when pinvoke is enabled - #91292

Merged
fanyang-mono merged 5 commits into
dotnet:mainfrom
fanyang-mono:fix_field_offset
Aug 31, 2023
Merged

[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292
fanyang-mono merged 5 commits into
dotnet:mainfrom
fanyang-mono:fix_field_offset

Conversation

@fanyang-mono

@fanyang-monofanyang-mono commented Aug 29, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Fixes: #90955

This is an existing bug for both JIT and AOT. Basically, the issue was that the offset from one layer above wasn't carried on when calculating offset for nested struct fields. I've added a test to lock down this behavior and verified that the test failed without this change.

@fanyang-mono

fanyang-mono commented Aug 29, 2023

Copy link
Copy Markdown
MemberAuthor

This should be backported to .NET8/7/6.

lambdageek
lambdageek reviewed Aug 30, 2023
View reviewed changes

@lambdageeklambdageek left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The test can be simplified - you don't need any methods in the struct definitions - just fields.

The test can also go into src/tests/Interop/StructMarshalling/PInvoke/ and can be updated like the other .csproj files in that directory to use the .cpp file to implement a C++ function that takes the right kind of argument struct.

Comment threadsrc/tests/JIT/Directed/pinvoke/GameControllerButtonBind.cs Outdated
Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.csproj Outdated
Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.cs Outdated
@fanyang-mono

fanyang-mono commented Aug 30, 2023

Copy link
Copy Markdown
MemberAuthor

Newly added test failed on wasm with interpreter. Investigating it now.

@fanyang-mono

fanyang-mono commented Aug 30, 2023

Copy link
Copy Markdown
MemberAuthor

The wasm apps created for runtime tests weren't including c++ file/library needed by the test. See details in #64127. Disabled newly added test on wasm.

@fanyang-mono

fanyang-mono commented Aug 30, 2023

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-extra-platforms

@azure-pipelines

azure-pipelinesBot commented Aug 30, 2023

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023
Closed
Open
Closed
Closed
Closed
@fanyang-mono

fanyang-mono commented Aug 31, 2023

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-extra-platforms

@azure-pipelines

azure-pipelinesBot commented Aug 31, 2023

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023
Closed
Open
@fanyang-mono

fanyang-mono commented Aug 31, 2023

Copy link
Copy Markdown
MemberAuthor

Library test failures were related to #91410.

@fanyang-mono

fanyang-mono commented Aug 31, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to release/8.0

@github-actions

github-actionsBot commented Aug 31, 2023

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6041888778

@fanyang-mono

fanyang-mono commented Aug 31, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to release/7.0-staging

@fanyang-mono

fanyang-mono commented Aug 31, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to release/6.0-staging

@github-actions

github-actionsBot commented Aug 31, 2023

Copy link
Copy Markdown
Contributor

Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6041900557

@github-actions

github-actionsBot commented Aug 31, 2023

Copy link
Copy Markdown
Contributor

Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/6041901510

@github-actionsgithub-actionsBot mentioned this pull request Aug 31, 2023
Merged
@github-actions

github-actionsBot commented Aug 31, 2023

Copy link
Copy Markdown
Contributor

@fanyang-mono backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!

@github-actions

github-actionsBot commented Aug 31, 2023

Copy link
Copy Markdown
Contributor

@fanyang-mono an error occurred while backporting to release/7.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@github-actions

github-actionsBot commented Aug 31, 2023

Copy link
Copy Markdown
Contributor

@fanyang-mono backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Using index info to reconstruct a base tree...
M	src/mono/mono/mini/mini-amd64.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/mini-amd64.c
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!

@github-actions

github-actionsBot commented Aug 31, 2023

Copy link
Copy Markdown
Contributor

@fanyang-mono an error occurred while backporting to release/6.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

This was referenced Aug 31, 2023
Merged
Merged
@fanyang-mono
fanyang-mono merged commit cd4a253 into dotnet:mainAug 31, 2023
@ghostghost locked as resolved and limited conversation to collaborators Oct 1, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@lambdageeklambdageeklambdageek approved these changes
@vargazvargazAwaiting requested review from vargaz
@SamMonoRTSamMonoRTAwaiting requested review from SamMonoRT

Assignees

@fanyang-monofanyang-mono

Labels

area-Codegen-JIT-mono

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Mono] Regression: amd64 AOT: condition `class1 != ARG_CLASS_NO_CLASS' not met

2 participants

@fanyang-mono@lambdageek
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled by fanyang-mono · Pull Request #91292 · dotnet/runtime · GitHub
Skip to content
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled - #91292
Merged
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Aug 31, 2023
Merged
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Conversation
@fanyang-mono
@fanyang-monofanyang-mono
commented
Aug 29, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Fixes: #90955
This is an existing bug for both JIT and AOT. Basically, the issue was that the offset from one layer above wasn't carried on when calculating offset for nested struct fields. I've added a test to lock down this behavior and verified that the test failed without this change.
@fanyang-mono
fanyang-mono
commented
Aug 29, 2023

Copy link


Copy Markdown

MemberAuthor
This should be backported to .NET8/7/6.
lambdageek
lambdageek
reviewed
Aug 30, 2023
View reviewed changes
@lambdageeklambdageek
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The test can be simplified - you don't need any methods in the struct definitions - just fields.
The test can also go into src/tests/Interop/StructMarshalling/PInvoke/ and can be updated like the other .csproj files in that directory to use the .cpp file to implement a C++ function that takes the right kind of argument struct.
Comment threadsrc/tests/JIT/Directed/pinvoke/GameControllerButtonBind.cs
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.csproj
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.cs
Outdated

@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
Newly added test failed on wasm with interpreter. Investigating it now.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
The wasm apps created for runtime tests weren't including c++ file/library needed by the test. See details in #64127. Disabled newly added test on wasm.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 30, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open


Closed


Closed


Closed

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 31, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
Library test failures were related to #91410.
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6041888778
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/6.0-staging
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6041900557
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/6041901510
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 31, 2023
 Merged

@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/7.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Using index info to reconstruct a base tree...
M	src/mono/mono/mini/mini-amd64.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/mini-amd64.c
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/6.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.

This was referenced Aug 31, 2023
 Merged

 Merged

@fanyang-mono
fanyang-mono
merged commit cd4a253
into
dotnet:mainAug 31, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@lambdageeklambdageeklambdageek approved these changes
@vargazvargazAwaiting requested review from vargaz
@SamMonoRTSamMonoRTAwaiting requested review from SamMonoRT

Assignees

@fanyang-monofanyang-mono

Labels

area-Codegen-JIT-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[Mono] Regression: amd64 AOT: condition `class1 != ARG_CLASS_NO_CLASS' not met


2 participants

@fanyang-mono@lambdageek

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled by fanyang-mono · Pull Request #91292 · dotnet/runtime · GitHub
Skip to content
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled - #91292
Merged
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Aug 31, 2023
Merged
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Conversation
@fanyang-mono
@fanyang-monofanyang-mono
commented
Aug 29, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Fixes: #90955
This is an existing bug for both JIT and AOT. Basically, the issue was that the offset from one layer above wasn't carried on when calculating offset for nested struct fields. I've added a test to lock down this behavior and verified that the test failed without this change.
@fanyang-mono
fanyang-mono
commented
Aug 29, 2023

Copy link


Copy Markdown

MemberAuthor
This should be backported to .NET8/7/6.
lambdageek
lambdageek
reviewed
Aug 30, 2023
View reviewed changes
@lambdageeklambdageek
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The test can be simplified - you don't need any methods in the struct definitions - just fields.
The test can also go into src/tests/Interop/StructMarshalling/PInvoke/ and can be updated like the other .csproj files in that directory to use the .cpp file to implement a C++ function that takes the right kind of argument struct.
Comment threadsrc/tests/JIT/Directed/pinvoke/GameControllerButtonBind.cs
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.csproj
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.cs
Outdated

@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
Newly added test failed on wasm with interpreter. Investigating it now.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
The wasm apps created for runtime tests weren't including c++ file/library needed by the test. See details in #64127. Disabled newly added test on wasm.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 30, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open


Closed


Closed


Closed

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 31, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
Library test failures were related to #91410.
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6041888778
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/6.0-staging
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6041900557
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/6041901510
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 31, 2023
 Merged

@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/7.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Using index info to reconstruct a base tree...
M	src/mono/mono/mini/mini-amd64.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/mini-amd64.c
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/6.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.

This was referenced Aug 31, 2023
 Merged

 Merged

@fanyang-mono
fanyang-mono
merged commit cd4a253
into
dotnet:mainAug 31, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@lambdageeklambdageeklambdageek approved these changes
@vargazvargazAwaiting requested review from vargaz
@SamMonoRTSamMonoRTAwaiting requested review from SamMonoRT

Assignees

@fanyang-monofanyang-mono

Labels

area-Codegen-JIT-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[Mono] Regression: amd64 AOT: condition `class1 != ARG_CLASS_NO_CLASS' not met


2 participants

@fanyang-mono@lambdageek

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled by fanyang-mono · Pull Request #91292 · dotnet/runtime · GitHub
Skip to content
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled - #91292
Merged
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Aug 31, 2023
Merged
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Conversation
@fanyang-mono
@fanyang-monofanyang-mono
commented
Aug 29, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Fixes: #90955
This is an existing bug for both JIT and AOT. Basically, the issue was that the offset from one layer above wasn't carried on when calculating offset for nested struct fields. I've added a test to lock down this behavior and verified that the test failed without this change.
@fanyang-mono
fanyang-mono
commented
Aug 29, 2023

Copy link


Copy Markdown

MemberAuthor
This should be backported to .NET8/7/6.
lambdageek
lambdageek
reviewed
Aug 30, 2023
View reviewed changes
@lambdageeklambdageek
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The test can be simplified - you don't need any methods in the struct definitions - just fields.
The test can also go into src/tests/Interop/StructMarshalling/PInvoke/ and can be updated like the other .csproj files in that directory to use the .cpp file to implement a C++ function that takes the right kind of argument struct.
Comment threadsrc/tests/JIT/Directed/pinvoke/GameControllerButtonBind.cs
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.csproj
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.cs
Outdated

@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
Newly added test failed on wasm with interpreter. Investigating it now.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
The wasm apps created for runtime tests weren't including c++ file/library needed by the test. See details in #64127. Disabled newly added test on wasm.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 30, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open


Closed


Closed


Closed

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 31, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
Library test failures were related to #91410.
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6041888778
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/6.0-staging
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6041900557
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/6041901510
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 31, 2023
 Merged

@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/7.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Using index info to reconstruct a base tree...
M	src/mono/mono/mini/mini-amd64.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/mini-amd64.c
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/6.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.

This was referenced Aug 31, 2023
 Merged

 Merged

@fanyang-mono
fanyang-mono
merged commit cd4a253
into
dotnet:mainAug 31, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@lambdageeklambdageeklambdageek approved these changes
@vargazvargazAwaiting requested review from vargaz
@SamMonoRTSamMonoRTAwaiting requested review from SamMonoRT

Assignees

@fanyang-monofanyang-mono

Labels

area-Codegen-JIT-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[Mono] Regression: amd64 AOT: condition `class1 != ARG_CLASS_NO_CLASS' not met


2 participants

@fanyang-mono@lambdageek

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled by fanyang-mono · Pull Request #91292 · dotnet/runtime · GitHub
Skip to content
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled - #91292
Merged
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Aug 31, 2023
Merged
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Conversation
@fanyang-mono
@fanyang-monofanyang-mono
commented
Aug 29, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Fixes: #90955
This is an existing bug for both JIT and AOT. Basically, the issue was that the offset from one layer above wasn't carried on when calculating offset for nested struct fields. I've added a test to lock down this behavior and verified that the test failed without this change.
@fanyang-mono
fanyang-mono
commented
Aug 29, 2023

Copy link


Copy Markdown

MemberAuthor
This should be backported to .NET8/7/6.
lambdageek
lambdageek
reviewed
Aug 30, 2023
View reviewed changes
@lambdageeklambdageek
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The test can be simplified - you don't need any methods in the struct definitions - just fields.
The test can also go into src/tests/Interop/StructMarshalling/PInvoke/ and can be updated like the other .csproj files in that directory to use the .cpp file to implement a C++ function that takes the right kind of argument struct.
Comment threadsrc/tests/JIT/Directed/pinvoke/GameControllerButtonBind.cs
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.csproj
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.cs
Outdated

@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
Newly added test failed on wasm with interpreter. Investigating it now.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
The wasm apps created for runtime tests weren't including c++ file/library needed by the test. See details in #64127. Disabled newly added test on wasm.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 30, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open


Closed


Closed


Closed

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 31, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
Library test failures were related to #91410.
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6041888778
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/6.0-staging
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6041900557
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/6041901510
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 31, 2023
 Merged

@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/7.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Using index info to reconstruct a base tree...
M	src/mono/mono/mini/mini-amd64.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/mini-amd64.c
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/6.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.

This was referenced Aug 31, 2023
 Merged

 Merged

@fanyang-mono
fanyang-mono
merged commit cd4a253
into
dotnet:mainAug 31, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@lambdageeklambdageeklambdageek approved these changes
@vargazvargazAwaiting requested review from vargaz
@SamMonoRTSamMonoRTAwaiting requested review from SamMonoRT

Assignees

@fanyang-monofanyang-mono

Labels

area-Codegen-JIT-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[Mono] Regression: amd64 AOT: condition `class1 != ARG_CLASS_NO_CLASS' not met


2 participants

@fanyang-mono@lambdageek

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled by fanyang-mono · Pull Request #91292 · dotnet/runtime · GitHub
Skip to content
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled - #91292
Merged
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Aug 31, 2023
Merged
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Conversation
@fanyang-mono
@fanyang-monofanyang-mono
commented
Aug 29, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Fixes: #90955
This is an existing bug for both JIT and AOT. Basically, the issue was that the offset from one layer above wasn't carried on when calculating offset for nested struct fields. I've added a test to lock down this behavior and verified that the test failed without this change.
@fanyang-mono
fanyang-mono
commented
Aug 29, 2023

Copy link


Copy Markdown

MemberAuthor
This should be backported to .NET8/7/6.
lambdageek
lambdageek
reviewed
Aug 30, 2023
View reviewed changes
@lambdageeklambdageek
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The test can be simplified - you don't need any methods in the struct definitions - just fields.
The test can also go into src/tests/Interop/StructMarshalling/PInvoke/ and can be updated like the other .csproj files in that directory to use the .cpp file to implement a C++ function that takes the right kind of argument struct.
Comment threadsrc/tests/JIT/Directed/pinvoke/GameControllerButtonBind.cs
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.csproj
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.cs
Outdated

@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
Newly added test failed on wasm with interpreter. Investigating it now.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
The wasm apps created for runtime tests weren't including c++ file/library needed by the test. See details in #64127. Disabled newly added test on wasm.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 30, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open


Closed


Closed


Closed

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 31, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
Library test failures were related to #91410.
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6041888778
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/6.0-staging
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6041900557
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/6041901510
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 31, 2023
 Merged

@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/7.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Using index info to reconstruct a base tree...
M	src/mono/mono/mini/mini-amd64.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/mini-amd64.c
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/6.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.

This was referenced Aug 31, 2023
 Merged

 Merged

@fanyang-mono
fanyang-mono
merged commit cd4a253
into
dotnet:mainAug 31, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@lambdageeklambdageeklambdageek approved these changes
@vargazvargazAwaiting requested review from vargaz
@SamMonoRTSamMonoRTAwaiting requested review from SamMonoRT

Assignees

@fanyang-monofanyang-mono

Labels

area-Codegen-JIT-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[Mono] Regression: amd64 AOT: condition `class1 != ARG_CLASS_NO_CLASS' not met


2 participants

@fanyang-mono@lambdageek

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled by fanyang-mono · Pull Request #91292 · dotnet/runtime · GitHub
Skip to content
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled - #91292
Merged
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Aug 31, 2023
Merged
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Conversation
@fanyang-mono
@fanyang-monofanyang-mono
commented
Aug 29, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Fixes: #90955
This is an existing bug for both JIT and AOT. Basically, the issue was that the offset from one layer above wasn't carried on when calculating offset for nested struct fields. I've added a test to lock down this behavior and verified that the test failed without this change.
@fanyang-mono
fanyang-mono
commented
Aug 29, 2023

Copy link


Copy Markdown

MemberAuthor
This should be backported to .NET8/7/6.
lambdageek
lambdageek
reviewed
Aug 30, 2023
View reviewed changes
@lambdageeklambdageek
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The test can be simplified - you don't need any methods in the struct definitions - just fields.
The test can also go into src/tests/Interop/StructMarshalling/PInvoke/ and can be updated like the other .csproj files in that directory to use the .cpp file to implement a C++ function that takes the right kind of argument struct.
Comment threadsrc/tests/JIT/Directed/pinvoke/GameControllerButtonBind.cs
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.csproj
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.cs
Outdated

@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
Newly added test failed on wasm with interpreter. Investigating it now.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
The wasm apps created for runtime tests weren't including c++ file/library needed by the test. See details in #64127. Disabled newly added test on wasm.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 30, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open


Closed


Closed


Closed

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 31, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
Library test failures were related to #91410.
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6041888778
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/6.0-staging
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6041900557
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/6041901510
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 31, 2023
 Merged

@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/7.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Using index info to reconstruct a base tree...
M	src/mono/mono/mini/mini-amd64.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/mini-amd64.c
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/6.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.

This was referenced Aug 31, 2023
 Merged

 Merged

@fanyang-mono
fanyang-mono
merged commit cd4a253
into
dotnet:mainAug 31, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@lambdageeklambdageeklambdageek approved these changes
@vargazvargazAwaiting requested review from vargaz
@SamMonoRTSamMonoRTAwaiting requested review from SamMonoRT

Assignees

@fanyang-monofanyang-mono

Labels

area-Codegen-JIT-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[Mono] Regression: amd64 AOT: condition `class1 != ARG_CLASS_NO_CLASS' not met


2 participants

@fanyang-mono@lambdageek

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled by fanyang-mono · Pull Request #91292 · dotnet/runtime · GitHub
Skip to content
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled - #91292
Merged
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Aug 31, 2023
Merged
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292
fanyang-mono merged 5 commits into
dotnet:mainfrom 
fanyang-mono:fix_field_offset
Conversation
@fanyang-mono
@fanyang-monofanyang-mono
commented
Aug 29, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Fixes: #90955
This is an existing bug for both JIT and AOT. Basically, the issue was that the offset from one layer above wasn't carried on when calculating offset for nested struct fields. I've added a test to lock down this behavior and verified that the test failed without this change.
@fanyang-mono
fanyang-mono
commented
Aug 29, 2023

Copy link


Copy Markdown

MemberAuthor
This should be backported to .NET8/7/6.
lambdageek
lambdageek
reviewed
Aug 30, 2023
View reviewed changes
@lambdageeklambdageek
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The test can be simplified - you don't need any methods in the struct definitions - just fields.
The test can also go into src/tests/Interop/StructMarshalling/PInvoke/ and can be updated like the other .csproj files in that directory to use the .cpp file to implement a C++ function that takes the right kind of argument struct.
Comment threadsrc/tests/JIT/Directed/pinvoke/GameControllerButtonBind.cs
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.csproj
Outdated

Comment threadsrc/tests/JIT/Directed/pinvoke/pinvoke-allPlatforms.cs
Outdated

@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
Newly added test failed on wasm with interpreter. Investigating it now.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
The wasm apps created for runtime tests weren't including c++ file/library needed by the test. See details in #64127. Disabled newly added test on wasm.
@fanyang-mono
fanyang-mono
commented
Aug 30, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 30, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open


Closed


Closed


Closed

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Aug 31, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 31, 2023

Closed


Open

@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
Library test failures were related to #91410.
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6041888778
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@fanyang-mono
fanyang-mono
commented
Aug 31, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/6.0-staging
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6041900557
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/6041901510
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 31, 2023
 Merged

@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/7.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix offset calculation for nested struct
Using index info to reconstruct a base tree...
M	src/mono/mono/mini/mini-amd64.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/mini-amd64.c
Applying: Add a testfor nested struct with pinvoke
Applying: Move and update test with real c++ implementation
Applying: Exclude newly added test from wasm
Using index info to reconstruct a base tree...
M	src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Exclude newly added test from wasm
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!
@github-actions
github-actionsBot
commented
Aug 31, 2023

Copy link


Copy Markdown

Contributor
@fanyang-mono an error occurred while backporting to release/6.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.

This was referenced Aug 31, 2023
 Merged

 Merged

@fanyang-mono
fanyang-mono
merged commit cd4a253
into
dotnet:mainAug 31, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@lambdageeklambdageeklambdageek approved these changes
@vargazvargazAwaiting requested review from vargaz
@SamMonoRTSamMonoRTAwaiting requested review from SamMonoRT

Assignees

@fanyang-monofanyang-mono

Labels

area-Codegen-JIT-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[Mono] Regression: amd64 AOT: condition `class1 != ARG_CLASS_NO_CLASS' not met


2 participants

@fanyang-mono@lambdageek