refactor[venom]: refactor assembler and more #4717

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

Jump to bottom

Draft

harkal wants to merge 182 commits into vyperlang:master from harkal:refactor/asm/recursion_harry

Collaborator

harkal commented Jul 18, 2025

What I did

How I did it

How to verify it

Commit message

Commit message for the final, squashed PR. (Optional, but reviewers will appreciate it! Please see our commit message style guide for what we would ideally like to see in a commit message.)

Description for the changelog

Cute Animal Picture

charles-cooper and others added 30 commits

May 2, 2025 12:55


          refactor symbol handling in assembly to have more structure

c52246f

explicit Label/PUSHLABEL instructions.

wip

wip

a07684c


          charles

e1db421


          fix for postambles

00db4df


          more fixes

5e83ccc


          sanity help

1f68273


          small fixes

82b87b1


          introduce a performance regression

b85f758


          fix PUSHLABEL for runtime_begin

75838b7


          fix bad instruction

beeeca7

wip

f65a94e


          update optimizations

304d5ae


          fix venom_to_assembly

1f95319


          fix off-by-ones

e50003d


          fix type error

136362e


          update test

338ca39


          venom_to_assembly fixes

6a661ab


          comment

69f5be1


          comment update

c152600


          add PUSH_OFST

4dea535


          comment

2624aa2


          fix push_ofst

952ef29


          push_ofst in venom_to_assembly

52e65c4


          remove jumpdest instruction

6a8183e


          Merge branch 'master' into refactor/asm/labels

f2e5460


          update comment

d6864fe


          wip - refactor IRnode to assembly into a class

a0c48c0


          more progress

d330346


          make it compile, add asm_runtime output

d0dda4c

harkal added 27 commits

July 9, 2025 14:20


          refactor

6afe95e


          pushsymbol wip

3686d92


          refactor unresolved constant handling

847117b


          improve constant resolution logic

3c3c3e8


          prefix refactor

e42b320


          add handling for LabelRef in VenomTransformer

571a182


          refactor/cleanup

7278d2f

wip

49f4304


          Add UnresolvedConst

9111c8a


          lint

f6d07ed


          parser cleanup

3bdeb09


          venom_to_assembly cleanup

124f97b


          cleanup

9d32eea


          handle empty liveness

192c757


          Merge remote-tracking branch 'origin-vyper/master' into refactor/asm/…

0e1c75a

…recursion_harry


          replace leftour store opcode with assign in tests

4dc29f4


          remove PUSHSYMBOL class and its uses

d7a61a4


          rename is_symbol function to is_label for clarity and update references

96e723d


          cleanup unsused

f7a54bb


          refactor

d6bbf5f


          extract label-dependent constants into a separate function

808a019


          implement _resolve_push_ofst_value function for PUSH_OFST offset reso…

3e5cc97

…lution


          update left out is_symbol

b61c5f0


          lint

5cf496d


          refactor to dataclasses

580531a


          more dataclass refactor /split out instructions.py

c4a12eb


          use len() == 0 instead of not

93d4980

harkal changed the title refactor[venom]: Refactor assembler and *more* refactor[venom]: Refactor assembler and more

harkal changed the title ~~refactor[venom]: Refactor assembler and more~~ refactor[venom]: refactor assembler and *more*

github-advanced-security bot found potential problems

View reviewed changes

vyper/evm/assembler/instructions.py

+              class DATA_ITEM:
+                  data: bytes | Label
+                  def __repr__(self) -> str:

Check notice

Code scanning / CodeQL

Explicit returns mixed with implicit (fall through) returns Note

Mixing implicit and explicit returns may indicate an error as implicit returns always return None.

vyper/evm/assembler/instructions.py



		# a string (assembly instruction) but with additional metadata from the source code
		class TaggedInstruction(str):

Check warning

Code scanning / CodeQL

`__eq__` not overridden when adding attributes Warning

The class 'TaggedInstruction' does not override

'__eq__'

, but adds the new attribute

error_msg

.
The class 'TaggedInstruction' does not override

'__eq__'

, but adds the new attribute

pc_debugger

.
The class 'TaggedInstruction' does not override

'__eq__'

, but adds the new attribute

ast_source

.

vyper/venom/const_eval.py

+                  """Generate a unique label name for an unresolved constant."""
+                  global _const_label_counter
+                  label = f"__const_{_const_label_counter}"
+                  _const_label_counter += 1

Check notice

Code scanning / CodeQL

Unused global variable Note

The global variable '_const_label_counter' is not used.

vyper/venom/memory_location.py

@@ @@ -5,7 +5,7 @@ @@
               from vyper.evm.address_space import MEMORY, STORAGE, TRANSIENT, AddrSpace
               from vyper.exceptions import CompilerPanic
-              from vyper.venom.basicblock import IRLiteral, IROperand, IRVariable
+              from vyper.venom.basicblock import ConstRef, IRLabel, IRLiteral, IROperand, IRVariable

Check failure

Code scanning / CodeQL

Module-level cyclic import Error

'ConstRef' may not be defined if module

vyper.venom.basicblock

is imported before module

vyper.venom.memory_location

, as the

definition

of ConstRef occurs after the cyclic

import

of vyper.venom.memory_location.

vyper/venom/memory_location.py

@@ @@ -5,7 +5,7 @@ @@
               from vyper.evm.address_space import MEMORY, STORAGE, TRANSIENT, AddrSpace
               from vyper.exceptions import CompilerPanic
-              from vyper.venom.basicblock import IRLiteral, IROperand, IRVariable
+              from vyper.venom.basicblock import ConstRef, IRLabel, IRLiteral, IROperand, IRVariable

Check failure

Code scanning / CodeQL

Module-level cyclic import Error

'IRLabel' may not be defined if module

vyper.venom.basicblock

is imported before module

vyper.venom.memory_location

, as the

definition

of IRLabel occurs after the cyclic

import

of vyper.venom.memory_location.

vyper/venom/memory_location.py

@@ @@ -5,7 +5,7 @@ @@
               from vyper.evm.address_space import MEMORY, STORAGE, TRANSIENT, AddrSpace
               from vyper.exceptions import CompilerPanic
-              from vyper.venom.basicblock import IRLiteral, IROperand, IRVariable
+              from vyper.venom.basicblock import ConstRef, IRLabel, IRLiteral, IROperand, IRVariable

Check failure

Code scanning / CodeQL

Module-level cyclic import Error

'IRLiteral' may not be defined if module

vyper.venom.basicblock

is imported before module

vyper.venom.memory_location

, as the

definition

of IRLiteral occurs after the cyclic

import

of vyper.venom.memory_location.

vyper/venom/memory_location.py

@@ @@ -5,7 +5,7 @@ @@
               from vyper.evm.address_space import MEMORY, STORAGE, TRANSIENT, AddrSpace
               from vyper.exceptions import CompilerPanic
-              from vyper.venom.basicblock import IRLiteral, IROperand, IRVariable
+              from vyper.venom.basicblock import ConstRef, IRLabel, IRLiteral, IROperand, IRVariable

Check failure

Code scanning / CodeQL

Module-level cyclic import Error

'IROperand' may not be defined if module

vyper.venom.basicblock

is imported before module

vyper.venom.memory_location

, as the

definition

of IROperand occurs after the cyclic

import

of vyper.venom.memory_location.

vyper/venom/memory_location.py

@@ @@ -5,7 +5,7 @@ @@
               from vyper.evm.address_space import MEMORY, STORAGE, TRANSIENT, AddrSpace
               from vyper.exceptions import CompilerPanic
-              from vyper.venom.basicblock import IRLiteral, IROperand, IRVariable
+              from vyper.venom.basicblock import ConstRef, IRLabel, IRLiteral, IROperand, IRVariable

Check failure

Code scanning / CodeQL

Module-level cyclic import Error

'IRVariable' may not be defined if module

vyper.venom.basicblock

is imported before module

vyper.venom.memory_location

, as the

definition

of IRVariable occurs after the cyclic

import

of vyper.venom.memory_location.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet