Skip to content

refactor[lang]: simplify typing logic around inf - #5233

Open
Sporarum wants to merge 24 commits into
vyperlang:masterfrom
Sporarum:simplify-inf-lists
Open

Sporarum wants to merge 24 commits into
vyperlang:masterfrom
Sporarum:simplify-inf-lists

Conversation

@Sporarum

@Sporarum Sporarum commented Sep 2, 2026

Copy link
Copy Markdown
Collaborator

What I did

Before #5127, the codegen type of an expression was always the expected type, with #5127 this would no longer work, as the expected type can contain wildcard lengths, which are not encodable (need to be resolved to a finite length or INF).
To solve this issue, it added _annotation_type which derives an encodable type from the inferred and expected type.

This PR refactors _annotation_type to give it nice properties, and to validate its invariants.

Fix #5251

How I did it

_interpolate is added alongside _annotation_type, it finds the smallest type between its two parameters, which contains no wildcards.
This allows us to remove empty_list_candidate_types which represented a kind of regression of #5177 (and thus re-introduced similar issues).

To support the above/fix bugs it uncovered, a couple more minor things are done:

  • Fix (codegen's) Expr.parse_IfExp's not copying ~empty into memory.
  • Fix _ExprAnalyser.types_from_Subscript producing multitypes1 containing the same type twice.
  • Fix not being able to do my_type.has_wildcard because _GenericTypeAcceptor didn't have it.
  • Let mypy know that a SArrayT.length is always an int

How to verify it

uv run pytest tests/unit/semantics/types/test_inf.py
tests/functional/codegen/features/test_inf_dynarray_runtime.py
tests/functional/codegen/features/test_ternary.py

Commit message

before d3c150e, the codegen type of an expression was always the
expected type. with d3c150e this no longer works, as the expected type
can now contain wildcard lengths, which are not encodable (need to be
resolved to a finite length or `INF`). to solve this issue, it added
`_annotation_type` which derives an encodable type from the inferred and
expected type.

this commit refactors `_annotation_type` to give it nice properties, and
to validate its invariants:

`_interpolate` finds the smallest type between its two parameters, which
contains no wildcards. this allows us to remove
`empty_list_candidate_types` which represented a kind of regression of
3867629 (and thus re-introduced similar issues).

to support the above/fix bugs it uncovered, a couple more minor things
are done:
* fix (codegen's) `Expr.parse_IfExp`'s not copying `~empty` into memory.
* fix `_ExprAnalyser.types_from_Subscript` producing multitypes[^1]
  containing the same type twice.
* fix not being able to do `my_type.has_wildcard` because
  `_GenericTypeAcceptor` didn't have it.
* let mypy know that `SArrayT.length` is always an int.

Description for the changelog

(refactor of a yet-unrealeased feature: no user-visible change)

Cute Animal Picture

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

Footnotes

  1. A list of all possible types for an expression

@github-actions

github-actions Bot commented Sep 2, 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

Comment thread vyper/semantics/analysis/local.py
@github-actions

github-actions Bot commented Sep 2, 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 24952 23578 19769 19059 18523
curvefi/amm/stableswap/meta_implementation/meta_implementation_v_700.vy 23610 22805 19565 18627 18314
curvefi/amm/stableswap/implementation/implementation_v_700.vy 24962 23769 19188 18363 18019
curvefi/legacy/CurveStableSwapNG.vy 24473 23298 18749 17981 17636
curvefi/amm/tricryptoswap/implementation/implementation_v_200.vy 20724 19959 17250 16689 16325
curvefi/amm/twocryptoswap/implementation/implementation_v_210.vy 17634 16894 14958 14376 14027
yearnfi/VaultV3.vy 19972 19063 14739 13818 13269
curvefi/legacy/CurveCryptoSwap2.vy 18947 18382 14619 14129 13954
yearnfi/VaultV2.vy 16676 15763 13258 12466 12049
curvefi/amm/stableswap/factory/factory_v_100.vy 14558 13978 11852 10780 10880
curvefi/gauge/child_gauge/implementation/implementation_v_110.vy 12338 11561 9781 9184 8795
curvefi/amm/stableswap/views/views_v_120.vy 12784 12368 9705 9059 9294
curvefi/gauge/child_gauge/implementation/implementation_v_100.vy 12017 11249 9514 8924 8538
curvefi/amm/tricryptoswap/math/math_v_200.vy 11189 11126 9029 8144 8170
curvefi/legacy/CurveCryptoMathOptimized3.vy 11188 11125 9028 8144 8170
curvefi/gauge/child_gauge/implementation/implementation_v_020.vy 10665 9947 8626 8100 7714
curvefi/registries/metaregistry/metaregistry_v_110.vy 7590 6732 6491 5710 5603
curvefi/helpers/router/router_v_110.vy 6717 6717 6251 5733 6035
curvefi/amm/tricryptoswap/views/views_v_200.vy 7821 7776 6111 5896 6045
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 5680 5479 5614
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 5506 5012 5039
curvefi/amm/twocryptoswap/factory/factory_v_200.vy 5540 5252 4617 3917 4047
curvefi/amm/tricryptoswap/factory/factory_v_200.vy 5246 5021 4483 3890 4020
curvefi/gauge/child_gauge/factory/factory_v_201.vy 4844 4547 3901 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 2936 2158 2461
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 2458 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 1782 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

@charles-cooper

Copy link
Copy Markdown
Member

approved pending clanker review

@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: a2aee454d3

ℹ️ 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/semantics/analysis/local.py Outdated
@Sporarum Sporarum mentioned this pull request Sep 4, 2026

@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: 480ab6905f

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread vyper/semantics/analysis/local.py Outdated

@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: 2c67c291dd

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread vyper/semantics/analysis/local.py Outdated

@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: 665d76aacf

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread vyper/semantics/analysis/local.py

@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: c37f91d62a

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread tests/functional/codegen/features/test_inf_dynarray_runtime.py Outdated
Comment thread tests/functional/codegen/features/test_inf_dynarray_runtime.py Fixed
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.

Issue compiling ternary ifs

4 participants