Skip to content

fix[venom]: retpc_param handle in inliner fix - #5254

Merged
harkal merged 11 commits into
vyperlang:masterfrom
HodanPlodky:fix/venom/function-inliner-retpc-retain-label
Sep 26, 2026
Merged

harkal merged 11 commits into
vyperlang:masterfrom
HodanPlodky:fix/venom/function-inliner-retpc-retain-label

Conversation

@HodanPlodky

@HodanPlodky HodanPlodky commented Sep 9, 2026 •

Copy link
Copy Markdown
Collaborator

What I did

Implementation of the fix that was shown by the #5219.

retpc_param should not be needed after if function inline. There was an error where because if was still there the label that does no longer exist was still referenced in the code.

How I did it

How to verify it

Commit message

This commit removes the retpc_param from the body of the function if it is inlined. This could create an error if the label would survived up until the bytecode emit it created the CompilerPanic

Description for the changelog

Cute Animal Picture

Put a link to a cute animal picture inside the parenthesis-->

@github-actions

github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown

Gas Changes

No changes detected.

Summary

  • Total tests measured: 560
  • Changed: 0
  • Regressions (gas up): 0
  • Improvements (gas down): 0
  • New tests: 0
  • Deleted tests: 0
  • Newly failing: 0
  • Newly passing: 0

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 32ba2cecc3

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread vyper/venom/passes/function_inliner.py Outdated
Comment on lines +136 to +137
retpc_inst = layout.retpc_param_opcode_inst
assert retpc_inst is not None

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Accept plain return-PC parameters when inlining

When the inliner is run on validator-accepted hand-written raw IR such as %retpc = param; ret %retpc, retpc_param_opcode_inst is None and this assertion aborts compilation. FunctionCallLayout.return_pc_param intentionally supports discovering a plain return-PC parameter from the return terminator, so use that semantic property rather than requiring the dedicated frontend opcode.

Useful? React with 👍 / 👎.

Comment thread vyper/venom/passes/function_inliner.py Outdated
# host's own reclaim governs the inlined data. Whether the
# host publishes is determined solely by the host's own
# terminators (plain `ret` is callee-save).
assert retpc_op in inst.operands, retpc_op

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Preserve return-PC aliases during inlining

When valid raw IR returns through an alias, for example %copy = %retpc; ret %copy, the calling-convention validator resolves that alias through FunctionCallLayout.param_for_alias, but this direct membership assertion rejects it. In addition, the earlier make_nop() leaves the alias instruction referring to an undefined variable, so alias-aware handling is needed rather than requiring every terminator to contain the original parameter variable.

Useful? React with 👍 / 👎.

@github-actions

github-actions Bot commented Sep 9, 2026 •

Copy link
Copy Markdown

📊 Bytecode Size Changes (venom)

No changes detected.

Full bytecode sizes

Contract legacy-O2 legacy-Os -O2 -O3 -Os
curvefi/legacy/CurveStableSwapMetaNG.vy 24941 23567 19769 19059 18523
curvefi/amm/stableswap/meta_implementation/meta_implementation_v_700.vy 23599 22794 19521 18627 18308
curvefi/amm/stableswap/implementation/implementation_v_700.vy 24951 23758 19139 18363 18013
curvefi/legacy/CurveStableSwapNG.vy 24462 23287 18701 17981 17631
curvefi/amm/tricryptoswap/implementation/implementation_v_200.vy 20724 19959 17175 16689 16325
curvefi/amm/twocryptoswap/implementation/implementation_v_210.vy 17634 16894 14901 14376 14027
yearnfi/VaultV3.vy 19972 19063 14531 13818 13247
curvefi/legacy/CurveCryptoSwap2.vy 18947 18382 14474 14129 13935
yearnfi/VaultV2.vy 16676 15763 13211 12466 12048
curvefi/amm/stableswap/factory/factory_v_100.vy 14558 13978 11724 10780 10855
curvefi/gauge/child_gauge/implementation/implementation_v_110.vy 12338 11561 9774 9184 8795
curvefi/amm/stableswap/views/views_v_120.vy 12784 12368 9663 9059 9294
curvefi/gauge/child_gauge/implementation/implementation_v_100.vy 12017 11249 9507 8924 8538
curvefi/amm/tricryptoswap/math/math_v_200.vy 11189 11126 8923 8144 8150
curvefi/legacy/CurveCryptoMathOptimized3.vy 11188 11125 8922 8144 8150
curvefi/gauge/child_gauge/implementation/implementation_v_020.vy 10665 9947 8606 8100 7714
curvefi/registries/metaregistry/metaregistry_v_110.vy 7590 6732 6481 5710 5603
curvefi/helpers/router/router_v_110.vy 6717 6717 6160 5733 6031
curvefi/amm/tricryptoswap/views/views_v_200.vy 7821 7776 6091 5896 6037
curvefi/helpers/stable_swap_meta_zap/stable_swap_meta_zap_v_100.vy 7302 7067 5877 5350 5610
curvefi/amm/twocryptoswap/views/views_v_200.vy 6991 6946 5660 5479 5606
curvefi/registries/metaregistry/registry_handlers/stableswap/handler_v_110.vy 6633 6259 5533 4695 5238
curvefi/amm/twocryptoswap/math/math_v_210.vy 6800 6800 5501 5012 5039
curvefi/amm/twocryptoswap/factory/factory_v_200.vy 5540 5252 4480 3917 4015
curvefi/amm/tricryptoswap/factory/factory_v_200.vy 5246 5021 4377 3890 3996
curvefi/gauge/child_gauge/factory/factory_v_201.vy 4844 4547 3895 3675 3511
curvefi/registries/metaregistry/registry_handlers/tricryptoswap/handler_v_110.vy 4241 3939 3718 3334 3429
curvefi/registries/metaregistry/registry_handlers/twocryptoswap/handler_v_110.vy 4186 3884 3671 3251 3329
curvefi/gauge/child_gauge/factory/factory_v_100.vy 4183 3914 3408 3144 2971
yearnfi/VaultFactory.vy 3765 3617 2713 2158 2434
curvefi/registries/address_provider/address_provider_v_201.vy 2973 2782 2613 2440 2353
curvefi/helpers/rate_provider/rate_provider_v_101.vy 3260 3260 2535 2263 2296
curvefi/amm/stableswap/math/math_v_100.vy 3067 3046 2453 2253 2310
curvefi/helpers/rate_provider/rate_provider_v_100.vy 2847 2841 2273 1954 1974
curvefi/helpers/deposit_and_stake_zap/deposit_and_stake_zap_v_100.vy 2322 2316 1774 1611 1670
curvefi/governance/relayer/taiko/relayer_v_001.vy 2068 2064 1731 1510 1558
curvefi/governance/relayer/polygon_cdk/relayer_v_101.vy 1556 1523 1530 1324 1347
curvefi/governance/relayer/arb_orbit/relayer_v_101.vy 1266 1262 1242 1066 1115
curvefi/governance/relayer/op_stack/relayer_v_101.vy 1186 1182 1183 1014 1056
curvefi/governance/relayer/not_rollup/relayer_v_100.vy 1168 1153 1174 1011 1037
curvefi/governance/vault/vault_v_100.vy 964 941 862 823 839
curvefi/governance/relayer/relayer_v_100.vy 496 496 593 490 503
curvefi/governance/agent/agent_v_100.vy 541 541 430 402 406
curvefi/governance/agent/agent_v_101.vy 541 541 430 402 406

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7af9f6fd7d

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread vyper/venom/passes/function_inliner.py Outdated

layout = FunctionCallLayout(func_copy)
retpc_inst = layout.retpc_param_opcode_inst
assert retpc_inst is not None

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Skip return-PC removal when no parameter exists

Validated raw Venom callees may return to a static label without declaring any return-PC parameter, as in ret @retpc (a shape explicitly accepted by the calling-convention tests). When such a callee is selected for inlining, retpc_param_opcode_inst is None, so this assertion aborts compilation even though the previous inliner could rewrite the return normally. Only remove the return-PC definition when the callee actually has one.

Useful? React with 👍 / 👎.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 15392bddd3

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread vyper/venom/passes/function_inliner.py Outdated
# host's own reclaim governs the inlined data. Whether the
# host publishes is determined solely by the host's own
# terminators (plain `ret` is callee-save).
assert retpc_op in inst.operands, retpc_op

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Allow static returns with an unused dedicated return PC

A validated raw callee may declare %retpc = retpc_param yet return through a static label, such as ret @exit; the calling-convention validator permits this because the return tail does not resolve to a conflicting parameter. Inlining such a single-call-site callee now aborts at this assertion even though the dedicated parameter can simply be removed and the static return rewritten to the continuation. This remains distinct from the already-reported missing-parameter case because retpc_inst is present here, so merely making its removal conditional would not fix it.

Useful? React with 👍 / 👎.

@harkal harkal left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

codex comments seem legit, all of those are valid raw IR that master inlines fine and now trip the asserts (retpc through a phi and no retpc/no ret too). fixture changes look like they're just there to dodge the assert

wouldn't it be simpler to just keep master's code and not bind retpc to the label?

binding_ops = (*binding_ops[:-1], IRLiteral(0))

your new test passes with that, no fixture changes needed, bytecode identical on everything I tried. the noinline ret fix is good tho, I'd keep that

@HodanPlodky
HodanPlodky requested a review from harkal September 25, 2026 13:03
@harkal
harkal merged commit e5117a8 into vyperlang:master Sep 26, 2026
171 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants