refactor[codegen]: split codegen packages

tests/conftest.py

@@ -18,7 +18,7 @@
 from tests.exports import TestExporter
 from tests.utils import working_directory
 from vyper import compiler
-from vyper.codegen.ir_node import IRnode
+from vyper.codegen_legacy.ir_node import IRnode
 from vyper.compiler import compile_code
 from vyper.compiler.input_bundle import FilesystemInputBundle
 from vyper.compiler.settings import OptimizationLevel, Settings, set_global_settings

tests/functional/builtins/codegen/test_abi_decode_fuzz.py

@@ -6,7 +6,10 @@
 from eth.codecs import abi
 
 from tests.evm_backends.base_env import EvmError
-from vyper.codegen.core import calculate_type_for_external_return, needs_external_call_wrap
+from vyper.codegen_shared.abi_utils import (
+    calculate_type_for_external_return,
+    needs_external_call_wrap,
+)
 from vyper.semantics.types import (
     AddressT,
     BoolT,

tests/functional/codegen/test_selector_table.py

@@ -3,7 +3,7 @@
 from hypothesis import given, settings
 
 import vyper.utils as utils
-from vyper.codegen.jumptable_utils import (
+from vyper.codegen_shared.jumptable_utils import (
     generate_dense_jumptable_info,
     generate_sparse_jumptable_buckets,
 )

tests/functional/codegen/test_selector_table_stability.py

@@ -1,4 +1,4 @@
-from vyper.codegen.jumptable_utils import generate_sparse_jumptable_buckets
+from vyper.codegen_shared.jumptable_utils import generate_sparse_jumptable_buckets
 from vyper.compiler import compile_code
 from vyper.compiler.settings import OptimizationLevel, Settings
 

tests/functional/codegen/types/numbers/test_exponents.py

@@ -2,7 +2,7 @@
 from hypothesis import given, settings
 from hypothesis import strategies as st
 
-from vyper.codegen.arithmetic import calculate_largest_base, calculate_largest_power
+from vyper.codegen_shared.arithmetic import calculate_largest_base, calculate_largest_power
 from vyper.compiler import compile_code
 from vyper.exceptions import InvalidLiteral
 

tests/functional/codegen/types/test_identifier_naming.py

@@ -2,7 +2,7 @@
 
 from vyper.ast.identifiers import RESERVED_KEYWORDS
 from vyper.builtins.functions import BUILTIN_FUNCTIONS
-from vyper.codegen.expr import ENVIRONMENT_VARIABLES
+from vyper.codegen_legacy.expr import ENVIRONMENT_VARIABLES
 from vyper.exceptions import NamespaceCollision, StructureException, SyntaxException
 from vyper.semantics.types.primitives import AddressT
 

tests/functional/syntax/test_for_range.py

@@ -482,6 +482,16 @@ def bar():
         (
             """
 @external
+def bar():
+    # Tuple targets are invalid Vyper syntax, but should raise SyntaxException.
+    for i, j in [(1, 2)]:
+        pass
+    """,
+            "invalid for loop syntax: not a name",
+        ),
+        (
+            """
+@external
 def bar():
     for i: in range(0, 1):
         pass

tests/unit/compiler/ir/test_compile_ir.py

@@ -1,6 +1,6 @@
 import pytest
 
-from vyper.codegen.ir_node import IRnode
+from vyper.codegen_legacy.ir_node import IRnode
 from vyper.evm.opcodes import version_check
 from vyper.ir import compile_ir
 from vyper.ir.s_expressions import parse_s_exp

tests/unit/compiler/ir/test_optimize_ir.py

@@ -1,6 +1,6 @@
 import pytest
 
-from vyper.codegen.ir_node import IRnode
+from vyper.codegen_legacy.ir_node import IRnode
 from vyper.evm.opcodes import version_check
 from vyper.exceptions import StaticAssertionException
 from vyper.ir import optimizer

tests/unit/compiler/test_default_settings.py

@@ -1,4 +1,4 @@
-from vyper.codegen import core
+from vyper.codegen_legacy import core
 from vyper.compiler.phases import CompilerData
 from vyper.compiler.settings import OptimizationLevel, _is_debug_mode
 

vyper/ast/parse.py

@@ -324,6 +324,14 @@ def visit_For(self, node):
         annotation_tokens = self._pre_parser.for_loop_annotations.pop(key)
 
         if not annotation_tokens:
+            if not isinstance(node.target, python_ast.Name):
+                raise SyntaxException(
+                    "invalid for loop syntax: not a name",
+                    self._source_code,
+                    node.target.lineno,
+                    node.target.col_offset,
+                )
+
             # a common case for people migrating to 0.4.0, provide a more
             # specific error message than "invalid type annotation"
             raise SyntaxException(

vyper/builtins/_convert.py

@@ -3,26 +3,26 @@
 import math
 
 from vyper import ast as vy_ast
-from vyper.codegen.core import (
+from vyper.codegen_legacy.core import (
     LOAD,
     IRnode,
     bytes_clamp,
     bytes_data_ptr,
     clamp,
     clamp_basetype,
     clamp_le,
     get_bytearray_length,
     int_clamp,
     is_bytes_m_type,
     is_decimal_type,
     is_flag_type,
     is_integer_type,
     sar,
     shl,
     shr,
     unwrap_location,
 )
-from vyper.codegen.expr import Expr
+from vyper.codegen_legacy.expr import Expr
 from vyper.exceptions import (
     CodegenPanic,
     CompilerPanic,

vyper/builtins/_signatures.py

@@ -3,8 +3,8 @@
 
 from vyper import ast as vy_ast
 from vyper.ast.validation import validate_call_args
-from vyper.codegen.expr import Expr
-from vyper.codegen.ir_node import IRnode
+from vyper.codegen_legacy.expr import Expr
+from vyper.codegen_legacy.ir_node import IRnode
 from vyper.exceptions import CompilerPanic, TypeMismatch, UnfoldableNode
 from vyper.semantics.analysis.base import Modifiability, StateMutability
 from vyper.semantics.analysis.utils import (

vyper/builtins/functions.py

@@ -5,41 +5,41 @@
 from vyper import ast as vy_ast
 from vyper.abi_types import ABI_Tuple
 from vyper.ast.validation import validate_call_args
-from vyper.codegen.abi_encoder import abi_encode
-from vyper.codegen.context import Context
-from vyper.codegen.core import (
+from vyper.codegen_legacy.abi_encoder import abi_encode
+from vyper.codegen_legacy.context import Context
+from vyper.codegen_legacy.core import (
     LOAD,
     STORE,
     IRnode,
     add_ofst,
     bytes_data_ptr,
     calculate_type_for_external_return,
     check_buffer_overflow_ir,
     check_create_operation,
     check_external_call,
     clamp,
     clamp2,
     clamp_basetype,
     copy_bytes,
     create_memory_copy,
     dummy_node_for_type,
     ensure_eval_once,
     ensure_in_memory,
     eval_seq,
     get_bytearray_length,
     get_type_for_exact_size,
     ir_tuple_from_args,
     make_setter,
     potential_overlap,
     promote_signed_int,
     sar,
     shl,
     shr,
     unwrap_location,
 )
-from vyper.codegen.expr import Expr
-from vyper.codegen.ir_node import Encoding, scope_multi
-from vyper.codegen.keccak256_helper import keccak256_helper
+from vyper.codegen_legacy.expr import Expr
+from vyper.codegen_legacy.ir_node import Encoding, scope_multi
+from vyper.codegen_legacy.keccak256_helper import keccak256_helper
 from vyper.evm.address_space import MEMORY
 from vyper.evm.opcodes import version_check
 from vyper.exceptions import (

vyper/cli/vyper_compile.py

@@ -9,7 +9,7 @@
 from typing import Any, Optional
 
 import vyper
-import vyper.codegen.ir_node as ir_node
+import vyper.codegen_legacy.ir_node as ir_node
 import vyper.evm.opcodes as evm
 from vyper.cli import vyper_json
 from vyper.cli.compile_archive import NotZipInput, compile_from_zip

vyper/cli/vyper_ir.py

@@ -3,7 +3,7 @@
 import sys
 
 import vyper
-from vyper.codegen.ir_node import IRnode
+from vyper.codegen_legacy.ir_node import IRnode
 from vyper.ir import compile_ir, optimizer
 from vyper.ir.s_expressions import parse_s_exp
 

vyper/codegen/abi_encoder.py → vyper/codegen_legacy/abi_encoder.py

@@ -1,13 +1,13 @@
-from vyper.codegen.core import (
+from vyper.codegen_legacy.core import (
     STORE,
     add_ofst,
     get_dyn_array_count,
     get_element_ptr,
-    is_tuple_like,
     make_setter,
     zero_pad,
 )
-from vyper.codegen.ir_node import IRnode
+from vyper.codegen_legacy.ir_node import IRnode
+from vyper.codegen_shared.abi_utils import abi_encoding_matches_vyper, is_tuple_like
 from vyper.evm.address_space import MEMORY
 from vyper.exceptions import CompilerPanic
 from vyper.semantics.types import DArrayT, SArrayT, _BytestringT
@@ -118,14 +118,6 @@
         return b.resolve(ret)
 
 
-def abi_encoding_matches_vyper(typ):
-    """
-    returns True if the ABI encoding matches vyper's memory encoding of
-    a type, otherwise False
-    """
-    return not typ.abi_type.is_dynamic()
-
-
 # assume dst is a pointer to a buffer located in memory which has at
 # least static_size + dynamic_size_bound allocated.
 # The basic strategy is this: