Skip to content

fix(bindgen): ensure moving storage pointers by abi size #1452

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.

Sign up for GitHub

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

Merged
vados-cosmonic merged 1 commit into from
May 8, 2026
Merged

fix(bindgen): ensure moving storage pointers by abi size #1452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 76 additions & 13 deletions crates/js-component-bindgen/src/intrinsics/lift.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,15 +730,37 @@ impl LiftIntrinsic {
let lift_flat_record_fn = self.name();
output.push_str(&format!(
r#"
function {lift_flat_record_fn}(keysAndLiftFns) {{
function {lift_flat_record_fn}(meta) {{
const {{ fieldMetas, size32: recordSize32, align32: recordAlign32 }} = meta;
return function {lift_flat_record_fn}Inner(ctx) {{
{debug_log_fn}('[{lift_flat_record_fn}()] args', {{ ctx }});

const originalPtr = ctx.storagePtr;
const res = {{}};
for (const [key, liftFn, _size32, _align32] of keysAndLiftFns) {{
for (const [key, liftFn, size32, align32] of fieldMetas) {{
let fieldPtr;
if (ctx.storagePtr !== undefined) {{
const rem = ctx.storagePtr % align32;
if (rem !== 0) {{ ctx.storagePtr += align32 - rem; }}
fieldPtr = ctx.storagePtr;
}}

let [val, newCtx] = liftFn(ctx);
res[key] = val;
ctx = newCtx;

if (fieldPtr !== undefined) {{
ctx.storagePtr = Math.max(ctx.storagePtr, fieldPtr + size32);
}}
}}

if (originalPtr !== undefined) {{
ctx.storagePtr = Math.max(ctx.storagePtr, originalPtr + recordSize32);
}}

if (ctx.storagePtr !== undefined) {{
const rem = ctx.storagePtr % recordAlign32;
if (rem !== 0) {{ ctx.storagePtr += recordAlign32 - rem; }}
}}

return [res, ctx];
Expand Down Expand Up @@ -777,7 +799,7 @@ impl LiftIntrinsic {
caseIdx = liftRes[0];
ctx = liftRes[1];

const [ tag, liftFn, size32, align32, payloadOffset32 ] = casesAndLiftFns[caseIdx];
const [ tag, liftFn, size32, align32, payloadOffset32, caseFlatCount, variantFlatCount ] = casesAndLiftFns[caseIdx];
if (payloadOffset32 === undefined) {{ throw new Error('unexpectedly missing payload offset'); }}

if (originalPtr !== undefined) {{
Expand All @@ -789,21 +811,42 @@ impl LiftIntrinsic {
val = {{ tag }};
// NOTE: here we need to move past the entire object in memory
// despite moving to the payload which we now know is missing/unnecessary
ctx.storagePtr = originalPtr + size32;
if (originalPtr !== undefined) {{
ctx.storagePtr = originalPtr + size32;
}}
}} else {{
const [newVal, newCtx] = liftFn(ctx);
val = {{ tag, val: newVal }};
ctx = newCtx;

// NOTE: Padding can be left over after doing the lift if it was less than
// space left for the payload normally.
if (ctx.storagePtr < originalPtr + size32) {{
ctx.storagePtr = originalPtr + size32;
if (originalPtr !== undefined) {{
ctx.storagePtr = Math.max(ctx.storagePtr, originalPtr + size32);
}}
}}

const rem = ctx.storagePtr % align32;
if (rem !== 0) {{ ctx.storagePtr += align32 - rem; }}
if (origUseParams) {{
if (caseFlatCount === undefined || variantFlatCount === undefined) {{
throw new Error('variant flat count metadata is missing');
}}
if (caseFlatCount === null || variantFlatCount === null) {{
throw new Error('cannot lift variant with unknown flat count');
}}
const remainingPayloadParams = variantFlatCount - 1 - caseFlatCount;
if (remainingPayloadParams < 0) {{
throw new Error(`invalid variant flat count metadata`);
}}
if (ctx.params.length < remainingPayloadParams) {{
throw new Error(`expected at least [${{remainingPayloadParams}}] remaining variant payload params, but got [${{ctx.params.length}}]`);
}}
ctx.params = ctx.params.slice(remainingPayloadParams);
}}

if (ctx.storagePtr !== undefined) {{
const rem = ctx.storagePtr % align32;
if (rem !== 0) {{ ctx.storagePtr += align32 - rem; }}
}}

return [val, ctx];
}}
Expand All @@ -824,12 +867,13 @@ impl LiftIntrinsic {
ctx.storagePtr = dataPtr;
const val = [];
for (var i = 0; i < len; i++) {{
const elemPtr = dataPtr + i * elemSize32;
ctx.storagePtr = elemPtr;
const [res, nextCtx] = elemLiftFn(ctx);
val.push(res);
ctx = nextCtx;

const rem = ctx.storagePtr % elemAlign32;
if (rem !== 0) {{ ctx.storagePtr += elemAlign32 - rem; }}
ctx.storagePtr = Math.max(ctx.storagePtr, elemPtr + elemSize32);
}}
if (originalPtr !== null) {{ ctx.storagePtr = originalPtr; }}
return [val, ctx];
Expand Down Expand Up @@ -930,18 +974,37 @@ impl LiftIntrinsic {
let lift_flat_tuple_fn = self.name();
output.push_str(&format!(
"
function {lift_flat_tuple_fn}(elemLiftFns) {{
function {lift_flat_tuple_fn}(meta) {{
const {{ elemLiftFns, size32: tupleSize32, align32: tupleAlign32 }} = meta;
return function {lift_flat_tuple_fn}Inner(ctx) {{
{debug_log_fn}('[{lift_flat_tuple_fn}()] args', {{ ctx }});

const originalPtr = ctx.storagePtr;
const val = [];
for (const [ liftFn, size32, align32 ] of elemLiftFns) {{
let elemPtr;
if (ctx.storagePtr !== undefined) {{
const rem = ctx.storagePtr % align32;
if (rem !== 0) {{ ctx.storagePtr += align32 - rem; }}
elemPtr = ctx.storagePtr;
}}

const [newValue, newCtx] = liftFn(ctx);
val.push(newValue);
ctx = newCtx;

const rem = ctx.storagePtr % align32;
if (rem !== 0) {{ ctx.storagePtr += align32 - rem; }}
if (elemPtr !== undefined) {{
ctx.storagePtr = Math.max(ctx.storagePtr, elemPtr + size32);
}}
}}

if (originalPtr !== undefined) {{
ctx.storagePtr = Math.max(ctx.storagePtr, originalPtr + tupleSize32);
}}

if (ctx.storagePtr !== undefined) {{
const rem = ctx.storagePtr % tupleAlign32;
if (rem !== 0) {{ ctx.storagePtr += tupleAlign32 - rem; }}
}}

return [val, ctx];
Expand Down
61 changes: 45 additions & 16 deletions crates/js-component-bindgen/src/intrinsics/lower.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,14 +610,29 @@ impl LowerIntrinsic {

output.push_str(&format!(
r#"
function {lower_flat_record_fn}(fieldMetas) {{
function {lower_flat_record_fn}(meta) {{
const {{ fieldMetas, size32: recordSize32, align32: recordAlign32 }} = meta;
return function {lower_flat_record_fn}Inner(ctx) {{
{debug_log_fn}('[{lower_flat_record_fn}()] args', {{ ctx }});

const originalPtr = ctx.storagePtr;
const r = ctx.vals[0];
for (const [tag, lowerFn, size32, align32 ] of fieldMetas) {{
const rem = ctx.storagePtr % align32;
if (rem !== 0) {{ ctx.storagePtr += align32 - rem; }}

const fieldPtr = ctx.storagePtr;
ctx.vals = [r[tag]];
lowerFn(ctx);

ctx.storagePtr = Math.max(ctx.storagePtr, fieldPtr + size32);
}}

ctx.storagePtr = Math.max(ctx.storagePtr, originalPtr + recordSize32);

const rem = ctx.storagePtr % recordAlign32;
if (rem !== 0) {{
ctx.storagePtr += recordAlign32 - rem;
}}
}}
}}
Expand Down Expand Up @@ -669,16 +684,10 @@ impl LowerIntrinsic {
ctx.vals = [val];
if (lowerFn) {{ lowerFn(ctx); }}

let bytesWritten = ctx.storagePtr - payloadOffsetPtr;
ctx.storagePtr = Math.max(ctx.storagePtr, originalPtr + size32);

const rem = ctx.storagePtr % align32;
if (rem !== 0) {{
const pad = align32 - rem;
ctx.storagePtr += pad;
bytesWritten += pad;
}}

ctx.storagePtr += bytesWritten;
if (rem !== 0) {{ ctx.storagePtr += align32 - rem; }}
}}
}}
"#));
Expand Down Expand Up @@ -720,16 +729,16 @@ impl LowerIntrinsic {
stringEncoding: ctx.stringEncoding,
}};
for (let idx = 0; idx < list.length; idx++) {{
const elemPtr = storagePtr + idx * elemSize32;
lowerCtx.storagePtr = elemPtr;
lowerCtx.vals = list.slice(idx, idx+1);
elemLowerFn(lowerCtx);
lowerCtx.storagePtr = Math.max(lowerCtx.storagePtr, elemPtr + elemSize32);
}}

const bytesLowered = lowerCtx.storagePtr - ctx.storagePtr;
ctx.storagePtr = lowerCtx.storagePtr;

// TODO: implement parma-only known-length processing

ctx.storagePtr += bytesLowered;
return;
}}

Expand All @@ -751,10 +760,12 @@ impl LowerIntrinsic {
const origPtr = ctx.storagePtr;
ctx.storagePtr = dataPtr;

ctx.storagePtr = dataPtr;
for (const elem of elems) {{
for (const [idx, elem] of elems.entries()) {{
const elemPtr = dataPtr + idx * elemSize32;
ctx.storagePtr = elemPtr;
ctx.vals = [elem];
elemLowerFn(ctx);
ctx.storagePtr = Math.max(ctx.storagePtr, elemPtr + elemSize32);
}}

ctx.storagePtr = origPtr;
Expand All @@ -766,9 +777,13 @@ impl LowerIntrinsic {
throw new TypeError(`invalid list input of length [${{elems.length}}], must be length [${{knownLen}}]`);
}}

for (const elem of elems) {{
const originalPtr = ctx.storagePtr;
for (const [idx, elem] of elems.entries()) {{
const elemPtr = originalPtr + idx * elemSize32;
ctx.storagePtr = elemPtr;
ctx.vals = [elem];
elemLowerFn(ctx);
ctx.storagePtr = Math.max(ctx.storagePtr, elemPtr + elemSize32);
}}
}}

Expand All @@ -789,13 +804,27 @@ impl LowerIntrinsic {

output.push_str(&format!(
r#"
function {lower_flat_tuple_fn}(elemLowerMetas) {{
function {lower_flat_tuple_fn}(meta) {{
const {{ elemLowerMetas, size32: tupleSize32, align32: tupleAlign32 }} = meta;
return function {lower_flat_tuple_fn}Inner(ctx) {{
{debug_log_fn}('[{lower_flat_tuple_fn}()] args', {{ ctx }});
const originalPtr = ctx.storagePtr;
const tuple = ctx.vals[0];
for (const [idx, [ lowerFn, size32, align32 ]] of elemLowerMetas.entries()) {{
const rem = ctx.storagePtr % align32;
if (rem !== 0) {{ ctx.storagePtr += align32 - rem; }}

const elemPtr = ctx.storagePtr;
ctx.vals = [tuple[idx]];
lowerFn(ctx);
ctx.storagePtr = Math.max(ctx.storagePtr, elemPtr + size32);
}}

ctx.storagePtr = Math.max(ctx.storagePtr, originalPtr + tupleSize32);

const rem = ctx.storagePtr % tupleAlign32;
if (rem !== 0) {{
ctx.storagePtr += tupleAlign32 - rem;
}}
}}
}}
Expand Down
Loading
Loading