Correctly handle padding in JS2 #660
Merged
Conversation
This file contains 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
This fixes rust-diplomat#656 but not rust-diplomat#657 The scalarpair struct part of the second test happens to pass since rust-diplomat#657 is only relevant for argument passing
Partially handles rust-diplomat#657
|
Forgot to handle end-padding .Done now. |
Manishearth
force-pushed
the
js-padding-scalar
branch
from
f9f623c
to
6871dc1
Compare
sffc
approved these changes
Aug 27, 2024
|
|
||
| assertValue() { | ||
| let functionCleanupArena = new diplomatRuntime.CleanupArena(); | ||
| wasm.ScalarPairWithPadding_assert_value(...this._intoFFI()); |
There was a problem hiding this comment.
Question: the WASM ABI expects a padding zero for every byte, not just for every i32?
There was a problem hiding this comment.
The padding fields can have different sizes, ranging from i8 to i32, based on the preceding field. That's what the first half of this PR fixes.
Comment on lines
+222
to
+234
| // There's no padding needed | ||
| (0 | 1, _) => ForcePaddingStatus::NoForce, | ||
| // Non-structs don't care | ||
| _ if !matches!(&field.ty, &hir::Type::Struct(_)) => ForcePaddingStatus::NoForce, | ||
| // 2-field struct contained in 2-field struct, caller decides | ||
| (2, 2) => { | ||
| needs_force_padding = true; | ||
| ForcePaddingStatus::PassThrough | ||
| } | ||
| // Outer struct has > 3 fields, always pad | ||
| (2, 3..) => ForcePaddingStatus::Force, | ||
| // Larger fields will always have padding anyway | ||
| _ => ForcePaddingStatus::NoForce |
There was a problem hiding this comment.
Thought: Wow, very specific rules. I trust this is the result of your research
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR:
It also generally cleans up the padding code and makes it reusable.