use generator

Author: iritkatriel

Python/codegen.c

@@ -3738,7 +3738,7 @@ maybe_optimize_function_call(compiler *c, expr_ty e, jump_target_label end)
     asdl_keyword_seq *kwds = e->v.Call.keywords;
     expr_ty func = e->v.Call.func;
 
-// if (! PyUnicode_Contains(_PyCompile_Filename(c), PyUnicode_FromString("cc.py"))) return 0;
+//  if (! PyUnicode_Contains(_PyCompile_Filename(c), PyUnicode_FromString("cc.py"))) return 0;
 
     if (! (func->kind == Name_kind &&
            asdl_seq_LEN(args) == 1 &&
@@ -3754,63 +3754,70 @@ maybe_optimize_function_call(compiler *c, expr_ty e, jump_target_label end)
         return 0;
     }
 
-    if (0 && generator_exp->v.GeneratorExp.elt->kind != Name_kind) {
-    //    _PyObject_Dump(_PyCompile_Filename(c));
-    //    fprintf(stderr, "location: %d", LOC(func).lineno);
-        return 0;
-    }
-
     location loc = LOC(func);
 
     int optimized = 0;
     NEW_JUMP_TARGET_LABEL(c, skip_optimization);
+
+    int const_oparg = -1;
+    PyObject *initial_res;
+    int continue_jump_oparg = -1;
     if (_PyUnicode_EqualToASCIIString(func->v.Name.id, "all")) {
+        const_oparg = CONSTANT_BUILTIN_ALL;
+        initial_res = Py_True;
+        continue_jump_oparg = POP_JUMP_IF_TRUE;
+    }
+    else if (_PyUnicode_EqualToASCIIString(func->v.Name.id, "any")) {
+        const_oparg = CONSTANT_BUILTIN_ANY;
+        initial_res = Py_False;
+        continue_jump_oparg = POP_JUMP_IF_FALSE;
+    }
+    else if (_PyUnicode_EqualToASCIIString(func->v.Name.id, "tuple")) {
+        const_oparg = CONSTANT_BUILTIN_TUPLE;
+    }
+    if (const_oparg != -1) {
         RETURN_IF_ERROR(codegen_nameop(c, loc, func->v.Name.id, Load));
-        ADDOP_I(c, loc, LOAD_COMMON_CONSTANT, CONSTANT_BUILTIN_ALL);
+        ADDOP_I(c, loc, LOAD_COMMON_CONSTANT, const_oparg);
         ADDOP_COMPARE(c, loc, Is);
         ADDOP_JUMP(c, loc, POP_JUMP_IF_FALSE, skip_optimization);
 
+        if (const_oparg == CONSTANT_BUILTIN_TUPLE) {
+            ADDOP_I(c, loc, BUILD_LIST, 0);
+        }
+        else {
+            ADDOP_LOAD_CONST(c, loc, initial_res);
+        }
+        VISIT(c, expr, generator_exp);
 
-        _PyCompile_InlinedComprehensionState inline_state = {NULL, NULL, NULL, NO_LABEL};
-
-        PySTEntryObject *entry = _PySymtable_Lookup(SYMTABLE(c), (void *)generator_exp);
-
-        comprehension_ty gen = (comprehension_ty)asdl_seq_GET(
-            generator_exp->v.GeneratorExp.generators, 0);
-
-        VISIT(c, expr, gen->iter);
-        ADDOP(c, LOC(gen->iter), GET_ITER);
-
-        RETURN_IF_ERROR(push_inlined_comprehension_state(c, loc, entry, &inline_state));
         NEW_JUMP_TARGET_LABEL(c, loop);
-        NEW_JUMP_TARGET_LABEL(c, proceed);
-        NEW_JUMP_TARGET_LABEL(c, finish);
         NEW_JUMP_TARGET_LABEL(c, cleanup);
 
-        ADDOP_LOAD_CONST(c, loc, Py_True);  // result
-        ADDOP_I(c, loc, SWAP, 2);
-
         USE_LABEL(c, loop);
         ADDOP_JUMP(c, loc, FOR_ITER, cleanup);
-        VISIT(c, expr, gen->target);
-        VISIT(c, expr, generator_exp->v.GeneratorExp.elt);
-        ADDOP(c, loc, TO_BOOL);
-        ADDOP_I(c, loc, COPY, 1);
-        ADDOP_JUMP(c, loc, POP_JUMP_IF_TRUE, proceed);
-
-        ADDOP_I(c, loc, SWAP, 3);
-        ADDOP(c, loc, POP_TOP);
-        ADDOP_JUMP(c, loc, JUMP, finish);
+        if (const_oparg == CONSTANT_BUILTIN_TUPLE) {
+            ADDOP_I(c, loc, LIST_APPEND, 2);
+            ADDOP_JUMP(c, loc, JUMP, loop);
+        }
+        else {
+            ADDOP(c, loc, TO_BOOL);
+            ADDOP_JUMP(c, loc, continue_jump_oparg, loop);
+        }
 
-        USE_LABEL(c, proceed);
-        ADDOP(c, loc, POP_TOP);
-        ADDOP_JUMP(c, loc, JUMP, loop);
+        ADDOP(c, NO_LOCATION, POP_ITER);
+        if (const_oparg == CONSTANT_BUILTIN_TUPLE) {
+            ADDOP_I(c, loc, LOAD_COMMON_CONSTANT, CONSTANT_BUILTIN_TUPLE);
+            ADDOP_I(c, loc, SWAP, 2);
+            ADDOP_I(c, loc, CALL, 1);
+        }
+        else {
+            ADDOP(c, loc, POP_TOP);
+            ADDOP_LOAD_CONST(c, loc, initial_res == Py_True ? Py_False : Py_True);
+        }
+        ADDOP_JUMP(c, loc, JUMP, end);
 
         USE_LABEL(c, cleanup);
         ADDOP(c, NO_LOCATION, END_FOR);
-        USE_LABEL(c, finish);
         ADDOP(c, NO_LOCATION, POP_ITER);
-        RETURN_IF_ERROR(pop_inlined_comprehension_state(c, loc, &inline_state));
 
         optimized = 1;
         ADDOP_JUMP(c, loc, JUMP, end);
@@ -3925,21 +3932,18 @@ codegen_call(compiler *c, expr_ty e)
     if (ret == 1) {
         return SUCCESS;
     }
-    NEW_JUMP_TARGET_LABEL(c, end);
-    ret = maybe_optimize_function_call(c, e, end);
-    if (ret < 0) {
-        return ERROR;
-    }
+    NEW_JUMP_TARGET_LABEL(c, skip_normal_call);
+    RETURN_IF_ERROR(maybe_optimize_function_call(c, e, skip_normal_call));
     RETURN_IF_ERROR(check_caller(c, e->v.Call.func));
     VISIT(c, expr, e->v.Call.func);
     location loc = LOC(e->v.Call.func);
     ADDOP(c, loc, PUSH_NULL);
     loc = LOC(e);
-    RETURN_IF_ERROR(codegen_call_helper(c, loc, 0,
-                                        e->v.Call.args,
-                                        e->v.Call.keywords));
-    USE_LABEL(c, end);
-    return SUCCESS;
+    ret = codegen_call_helper(c, loc, 0,
+                              e->v.Call.args,
+                              e->v.Call.keywords);
+    USE_LABEL(c, skip_normal_call);
+    return ret;
 }
 
 static int