-
Notifications
You must be signed in to change notification settings - Fork 5.5k
[Wasm R2R] Retype integer constant struct returns to the native return type #129102
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
Open
lewing
wants to merge
4
commits into
dotnet:main
Choose a base branch
from
lewing:lewing/wasm-r2r-retstruct-const-i64
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+11
−0
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
e1dcea7
[wasm] Retype integer constant struct returns to the native return type
lewing bc85b6f
Restrict struct-return constant retype to zero
lewing 9f55470
Use BashToZeroConst and apply on all targets
lewing c8065ca
Potential fix for pull request finding
lewing File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5859,6 +5859,17 @@ void Lowering::LowerRetStruct(GenTreeUnOp* ret) | |
| else | ||
| { | ||
| assert(varTypeUsesIntReg(nativeReturnType)); | ||
| // ZeroObj assertion propagation can create an INT zero for a wider | ||
| // (e.g. LONG) integer struct return. Retype it to the native return type | ||
| // so that targets with a typed value stack (Wasm) emit e.g. an i64.const | ||
| // rather than an i32.const. Mirrors the float/double case above. | ||
| #if defined(TARGET_WASM) | ||
| if (genActualType(retVal) != genActualType(nativeReturnType)) | ||
| { | ||
| assert(retVal->IsIntegralConst(0)); | ||
| retVal->BashToZeroConst(nativeReturnType); | ||
| } | ||
|
Comment on lines
+5867
to
+5871
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think instead of an assertion this should just be part of the if condition |
||
| #endif // defined(TARGET_WASM) | ||
| } | ||
| break; | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.