Fast locals part 3

Author: coolreader18

Lib/test/test_builtin.py

@@ -562,8 +562,6 @@ def keys(self):
                 return 1 # used to be 'a' but that's no longer an error
         self.assertRaises(TypeError, eval, 'dir()', globals(), C())
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_exec(self):
         g = {}
         exec('z = 1', g)

Lib/test/test_grammar.py

@@ -1067,8 +1067,6 @@ def g2(x):
         self.assertEqual(g2(False), 0)
         self.assertEqual(g2(True), ('end', 1))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_yield(self):
         # Allowed as standalone statement
         def g(): yield 1

Lib/test/test_importlib/test_api.py

@@ -242,8 +242,6 @@ def test_reload_loader_replaced(self):
             self.assertIs(reloaded, types)
             self.assertIs(sys.modules['types'], types)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_reload_location_changed(self):
         name = 'spam'
         with support.temp_cwd(None) as cwd:
@@ -295,8 +293,6 @@ def test_reload_location_changed(self):
                     self.maxDiff = None
                     self.assertEqual(ns, expected)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_reload_namespace_changed(self):
         name = 'spam'
         with support.temp_cwd(None) as cwd:

Lib/test/test_named_expression.py

@@ -336,9 +336,6 @@ def spam(a):
         self.assertEqual(res, [(1, 1, 1.0), (2, 2, 1.0), (3, 3, 1.0)])
         self.assertEqual(y, 3)
 
-    # TODO RustPython, added test_named_expression_scope_06_rp_modified as 
-    # minimaly modified variant of this test.
-    @unittest.expectedFailure 
     def test_named_expression_scope_06(self):
         res = [[spam := i for i in range(3)] for j in range(2)]
 
@@ -385,8 +382,6 @@ def eggs(b):
         self.assertEqual(res, [0, 2])
         self.assertEqual(a, 2)
 
-    # TODO RustPython, added test_named_expression_scope_10_rp_modified 
-    @unittest.expectedFailure 
     def test_named_expression_scope_10(self):
         res = [b := [a := 1 for i in range(2)] for j in range(2)]
 
@@ -522,7 +517,6 @@ def test_named_expression_variable_reuse_in_comprehensions(self):
                 self.assertEqual(ns["x"], 2)
                 self.assertEqual(ns["result"], [0, 1, 2])
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def test_named_expression_global_scope(self):
         sentinel = object()
         global GLOBAL_VAR

Lib/test/test_opcodes.py

@@ -38,8 +38,6 @@ class C: pass
         with self.assertRaises(AttributeError):
             C.__annotations__
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_use_existing_annotations(self):
         ns = {'__annotations__': {1: 2}}
         exec('x: int', ns)

Lib/test/test_os.py

@@ -1888,6 +1888,12 @@ def get_single(f):
         def helper(self):
             if  hasattr(os, f):
                 self.check(getattr(os, f))
+
+        # TODO: RUSTPYTHON; io.FileIO(fd) should check if the fd passed is valid
+        if f == "fdopen":
+            # this is test_fdopen
+            helper = unittest.expectedFailure(helper)
+
         return helper
     for f in singles:
         locals()["test_"+f] = get_single(f)

Lib/test/test_scope.py

@@ -136,7 +136,6 @@ def h():
         h = g(2, 4, 6)
         self.assertEqual(h(), 39)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def testFreeVarInMethod(self):
 
         def test():
@@ -202,7 +201,6 @@ def fact(n):
 
         self.assertEqual(f(6), 720)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def testUnoptimizedNamespaces(self):
 
         check_syntax_error(self, """if 1:
@@ -262,7 +260,6 @@ def testLambdas(self):
         h = g(2, 4, 6)
         self.assertEqual(h(), 18)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def testUnboundLocal(self):
 
         def errorInOuter():
@@ -280,7 +277,6 @@ def inner():
         self.assertRaises(UnboundLocalError, errorInOuter)
         self.assertRaises(NameError, errorInInner)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def testUnboundLocal_AfterDel(self):
         # #4617: It is now legal to delete a cell variable.
         # The following functions must obviously compile,
@@ -302,7 +298,6 @@ def inner():
         self.assertRaises(UnboundLocalError, errorInOuter)
         self.assertRaises(NameError, errorInInner)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def testUnboundLocal_AugAssign(self):
         # test for bug #1501934: incorrect LOAD/STORE_GLOBAL generation
         exec("""if 1:
@@ -335,7 +330,6 @@ def returner():
 
         self.assertEqual(makeReturner2(a=11)()['a'], 11)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def testScopeOfGlobalStmt(self):
         # Examples posted by Samuele Pedroni to python-dev on 3/1/2001
 
@@ -414,7 +408,6 @@ def get(self):
             self.assertEqual(g.get(), 13)
             """)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def testLeaks(self):
 
         class Foo:
@@ -437,7 +430,6 @@ def f2():
 
         self.assertEqual(Foo.count, 0)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def testClassAndGlobal(self):
 
         exec("""if 1:
@@ -460,7 +452,6 @@ class X:
             self.assertTrue(X.passed)
             """)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def testLocalsFunction(self):
 
         def f(x):
@@ -568,7 +559,6 @@ class TestClass:
 
         self.assertRaises(TypeError, sys.settrace)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def testEvalExecFreeVars(self):
 
         def f(x):
@@ -603,7 +593,6 @@ def x():
         except NameError:
             pass
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def testEvalFreeVars(self):
 
         def f(x):
@@ -661,7 +650,10 @@ def dec(self):
         self.assertEqual(c.dec(), 1)
         self.assertEqual(c.dec(), 0)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
+    # TODO: RUSTPYTHON, figure out how to communicate that `y = 9` should be
+    #                   stored as a global rather than a STORE_NAME, even when
+    #                   the `global y` is in a nested subscope
+    @unittest.expectedFailure
     def testGlobalInParallelNestedFunctions(self):
         # A symbol table bug leaked the global statement from one
         # function to other nested functions in the same block.
@@ -741,7 +733,6 @@ def top(a):
         def b():
             global a
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON
     def testClassNamespaceOverridesClosure(self):
         # See #17853.
         x = 42

Lib/test/test_symtable.py

@@ -121,6 +121,8 @@ def test_nonlocal(self):
         expected = ("some_var",)
         self.assertEqual(self.other_internal.get_nonlocals(), expected)
 
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
     def test_local(self):
         self.assertTrue(self.spam.lookup("x").is_local())
         self.assertFalse(self.spam.lookup("bar").is_local())

Lib/unittest/test/test_runner.py

@@ -277,8 +277,6 @@ def MockResultClass(*args):
         self.assertEqual(runner._makeResult(), expectedresult)
 
 
-    # TODO: RUSTPYTHON; -W arg for warning control
-    @unittest.expectedFailure
     def test_warnings(self):
         """
         Check that warnings argument of TextTestRunner correctly affects the

compiler/src/compile.rs

@@ -273,14 +273,13 @@ impl Compiler {
         let cellvar_cache = table
             .symbols
             .iter()
-            .filter(|(_, s)| matches!(s.scope, SymbolScope::Cell))
+            .filter(|(_, s)| s.scope == SymbolScope::Cell)
             .map(|(var, _)| var.clone())
             .collect();
         let freevar_cache = table
             .symbols
             .iter()
-            // TODO: check if Free or FREE_CLASS symbol
-            .filter(|(_, s)| matches!(s.scope, SymbolScope::Free))
+            .filter(|(_, s)| s.scope == SymbolScope::Free || s.is_free_class)
             .map(|(var, _)| var.clone())
             .collect();
 
@@ -336,6 +335,11 @@ impl Compiler {
             let doc = self.name("__doc__");
             self.emit(Instruction::StoreGlobal(doc))
         }
+
+        if self.find_ann(statements) {
+            self.emit(Instruction::SetupAnnotation);
+        }
+
         self.compile_statements(statements)?;
 
         assert_eq!(self.code_stack.len(), size_before);
@@ -433,9 +437,12 @@ impl Compiler {
                 cache = &mut info.varname_cache;
                 NameOpType::Fast
             }
-            SymbolScope::GlobalImplicit if self.ctx.in_func() => NameOpType::Global,
-            SymbolScope::Local | SymbolScope::GlobalImplicit => NameOpType::Local,
             SymbolScope::GlobalExplicit => NameOpType::Global,
+            SymbolScope::GlobalImplicit | SymbolScope::Unknown if self.ctx.in_func() => {
+                NameOpType::Global
+            }
+            SymbolScope::GlobalImplicit | SymbolScope::Unknown => NameOpType::Local,
+            SymbolScope::Local => NameOpType::Local,
             SymbolScope::Free => {
                 cache = &mut info.freevar_cache;
                 NameOpType::Deref
@@ -444,8 +451,8 @@ impl Compiler {
                 cache = &mut info.cellvar_cache;
                 NameOpType::Deref
             }
-            // TODO: is this right?
-            SymbolScope::Unknown => NameOpType::Global,
+            // // TODO: is this right?
+            // SymbolScope::Unknown => NameOpType::Global,
         };
         let mut idx = cache
             .get_index_of(name)
@@ -527,6 +534,10 @@ impl Compiler {
                 let module_idx = module.as_ref().map(|s| self.name(s));
 
                 if import_star {
+                    if self.ctx.in_func() {
+                        return Err(self
+                            .error_loc(CompileErrorType::FunctionImportStar, statement.location));
+                    }
                     let star = self.name("*");
                     // from .... import *
                     self.emit(Instruction::Import {
@@ -1069,6 +1080,8 @@ impl Compiler {
         }
 
         let mut code = self.pop_code_object();
+        self.current_qualified_path = old_qualified_path;
+        self.ctx = prev_ctx;
 
         // Prepare type annotations:
         let mut num_annotations = 0;
@@ -1138,9 +1151,6 @@ impl Compiler {
         let doc = self.name("__doc__");
         self.emit(Instruction::StoreAttr { idx: doc });
 
-        self.current_qualified_path = old_qualified_path;
-        self.ctx = prev_ctx;
-
         self.apply_decorators(decorator_list);
 
         self.store_name(name);
@@ -1151,12 +1161,17 @@ impl Compiler {
     fn build_closure(&mut self, code: &CodeObject) {
         if !code.freevars.is_empty() {
             for var in &code.freevars {
-                let symbol = self.symbol_table_stack.last().unwrap().lookup(var).unwrap();
+                let table = self.symbol_table_stack.last().unwrap();
+                let symbol = table.lookup(var).unwrap();
                 let parent_code = self.code_stack.last().unwrap();
                 let vars = match symbol.scope {
                     SymbolScope::Free => &parent_code.freevar_cache,
                     SymbolScope::Cell => &parent_code.cellvar_cache,
-                    _ => unreachable!(),
+                    _ if symbol.is_free_class => &parent_code.freevar_cache,
+                    x => unreachable!(
+                        "var {} in a {:?} should be free or cell but it's {:?}",
+                        var, table.typ, x
+                    ),
                 };
                 let mut idx = vars.get_index_of(var).unwrap();
                 if let SymbolScope::Free = symbol.scope {
@@ -1236,6 +1251,8 @@ impl Compiler {
         keywords: &[ast::Keyword],
         decorator_list: &[ast::Expression],
     ) -> CompileResult<()> {
+        self.prepare_decorators(decorator_list)?;
+
         let prev_ctx = self.ctx;
         self.ctx = CompileContext {
             func: FunctionContext::NoFunction,
@@ -1247,7 +1264,6 @@ impl Compiler {
         let old_qualified_path = self.current_qualified_path.take();
         self.current_qualified_path = Some(qualified_name.clone());
 
-        self.prepare_decorators(decorator_list)?;
         self.emit(Instruction::LoadBuildClass);
         let line_number = self.get_source_line_number();
         self.push_output(CodeObject::new(
@@ -1301,6 +1317,9 @@ impl Compiler {
 
         let code = self.pop_code_object();
 
+        self.current_qualified_path = old_qualified_path;
+        self.ctx = prev_ctx;
+
         self.build_closure(&code);
 
         self.emit_constant(bytecode::ConstantData::Code {
@@ -1350,8 +1369,6 @@ impl Compiler {
         self.apply_decorators(decorator_list);
 
         self.store_name(name);
-        self.current_qualified_path = old_qualified_path;
-        self.ctx = prev_ctx;
         Ok(())
     }
 
@@ -1579,18 +1596,17 @@ impl Compiler {
 
         if let ast::ExpressionType::Identifier { name } = &target.node {
             // Store as dict entry in __annotations__ dict:
-            if !self.ctx.in_func() {
-                let annotations = self.name("__annotations__");
-                self.emit(Instruction::LoadNameAny(annotations));
-                self.emit_constant(bytecode::ConstantData::Str {
-                    value: name.to_owned(),
-                });
-                self.emit(Instruction::StoreSubscript);
-            }
+            let annotations = self.name("__annotations__");
+            self.emit(Instruction::LoadNameAny(annotations));
+            self.emit_constant(bytecode::ConstantData::Str {
+                value: name.to_owned(),
+            });
+            self.emit(Instruction::StoreSubscript);
         } else {
             // Drop annotation if not assigned to simple identifier.
             self.emit(Instruction::Pop);
         }
+
         Ok(())
     }
 
@@ -2187,7 +2203,7 @@ impl Compiler {
         let line_number = self.get_source_line_number();
         // Create magnificent function <listcomp>:
         self.push_output(CodeObject::new(
-            Default::default(),
+            bytecode::CodeFlags::NEW_LOCALS | bytecode::CodeFlags::IS_OPTIMIZED,
             1,
             1,
             0,