Rebase temp/patch-20 on patch-20 (#23)

* Rebase temp/patch-20 onto patch-20 (emitfunc)

* Rebase temp/patch-20 onto patch-20 (class_ir)

* Rebase temp/patch-20 onto patch-20 (function)

Author: BobTheBuidler

mypyc/codegen/emitfunc.py

@@ -420,8 +420,7 @@ def visit_get_attr(self, op: GetAttr) -> None:
                 if not merged_branch:
                     var_name = op.attr.removeprefix(GENERATOR_ATTRIBUTE_PREFIX)
                     if cl.is_environment:
-                        # A generated class does not "exist" to the user, this is just an unbound
-                        # variable in their code, not a missing attribute on the generated class.
+                        # Environment classes represent locals, so missing attrs are unbound vars.
                         exc_class = "PyExc_UnboundLocalError"
                         exc_msg = f"local variable {var_name!r} referenced before assignment"
                     else:

mypyc/ir/class_ir.py

@@ -100,7 +100,7 @@ def __init__(
         self.module_name = module_name
         self.is_trait = is_trait
         self.is_generated = is_generated
-        # True for env classes where attributes represent locals.
+        # Environment classes represent locals and should emit UnboundLocalError for missing vars.
         self.is_environment = is_environment
         self.is_abstract = is_abstract
         self.is_ext_class = is_ext_class

mypyc/irbuild/function.py

@@ -251,6 +251,8 @@ def c() -> None:
         assert isinstance(fitem, FuncDef), fitem
         generator_class_ir = builder.mapper.fdef_to_generator[fitem]
         builder.fn_info.generator_class = GeneratorClass(generator_class_ir)
+        if builder.fn_info.can_merge_generator_and_env_classes():
+            builder.fn_info.generator_class.ir.is_environment = True
 
     # Functions that contain nested functions need an environment class to store variables that
     # are free in their nested functions. Generator functions need an environment class to
@@ -959,7 +961,6 @@ def gen_native_func_call_and_return(fdef: FuncDef) -> None:
     typ, src = builtin_names["builtins.int"]
     int_type_obj = builder.add(LoadAddress(typ, src, line))
     is_int = builder.builder.type_is_op(impl_to_use, int_type_obj, line)
-
     native_call, non_native_call = BasicBlock(), BasicBlock()
     builder.add_bool_branch(is_int, native_call, non_native_call)
     builder.activate_block(native_call)
@@ -1092,8 +1093,7 @@ def maybe_insert_into_registry_dict(builder: IRBuilder, fitem: FuncDef) -> None:
 
         dispatch_func_obj = builder.load_global_str(fitem.name, line)
         builder.primitive_op(
-            py_setattr_op, [dispatch_func_obj, builder.load_str("registry"), registry_dict], line
-        )
+            py_setattr_op, [dispatch_func_obj, builder.load_str("registry"), registry_dict], line)
 
     for singledispatch_func, types in to_register.items():
         # TODO: avoid recomputing the native IDs for all the functions every time we find a new
@@ -1107,8 +1107,7 @@ def maybe_insert_into_registry_dict(builder: IRBuilder, fitem: FuncDef) -> None:
             to_insert = builder.add(load_literal)
         # TODO: avoid reloading the registry here if we just created it
         dispatch_func_obj = load_func(
-            builder, singledispatch_func.name, singledispatch_func.fullname, line
-        )
+            builder, singledispatch_func.name, singledispatch_func.fullname, line)
         registry = load_singledispatch_registry(builder, dispatch_func_obj, line)
         for typ in types:
             loaded_type = load_type(builder, typ, None, line)