May 9, 2023 · Jan 30, 2023 · Jan 31, 2023 · Jan 31, 2023 · Jan 31, 2023 · Jan 31, 2023
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Include/opcode.h b/Include/opcode.h
diff --git a/Lib/opcode.py b/Lib/opcode.py

 pseudo_op('LOAD_METHOD', 262, ['LOAD_ATTR'])

 pseudo_op('STORE_FAST_MAYBE_NULL', 263, ['STORE_FAST'])

 MAX_PSEUDO_OPCODE = MIN_PSEUDO_OPCODE + len(_pseudo_ops) - 1

 del def_op, name_op, jrel_op, jabs_op, pseudo_op
diff --git a/Lib/test/test_listcomps.py b/Lib/test/test_listcomps.py
 """


 class ListComprehensionTest(unittest.TestCase):
    def test_unbound_local_after_comprehension(self):
        def f():
            if False:
                x = 0
            [x for x in [1]]
            return x

        with self.assertRaises(UnboundLocalError):
            f()


 __test__ = {'doctests' : doctests}

 def load_tests(loader, tests, pattern):
diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
        def get_tokens(string):
            return [(kind, string) for (kind, string, *_) in _generate_tokens_from_c_tokenizer(string)]

        import dis; dis.dis(get_tokens)

        code = dedent("""
            def fib(n):
                \\
diff --git a/Python/compile.c b/Python/compile.c
        case LOAD_FAST_OR_NULL:
            return 1;
        case STORE_FAST:
        case STORE_FAST_MAYBE_NULL:
            return -1;
        case DELETE_FAST:
            return 0;
            // could be cleverer about minimizing swaps but it doesn't matter
            // because `apply_static_swaps` will eliminate all of these anyway
            ADDOP_I(c, loc, SWAP, 2);
            ADDOP_NAME(c, loc,STORE_FAST, k, varnames);
            ADDOP_NAME(c, loc,STORE_FAST_MAYBE_NULL, k, varnames);
        }
    }
    return SUCCESS;
 }

 static void
 convert_exception_handlers_to_nops(basicblock *entryblock) {
 convert_pseudo_ops(basicblock *entryblock) {
    for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
        for (int i = 0; i < b->b_iused; i++) {
            struct instr *instr = &b->b_instr[i];
            if (is_block_push(instr) || instr->i_opcode == POP_BLOCK) {
                INSTR_SET_OP0(instr, NOP);
            } else if (instr->i_opcode == STORE_FAST_MAYBE_NULL) {
                instr->i_opcode = STORE_FAST;
            }
        }
    }
    }
    /* TO DO -- For 3.12, make sure that `maxdepth <= MAX_ALLOWED_STACK_USE` */

 convert_exception_handlers_to_nops(g->g_entryblock);
 convert_pseudo_ops(g->g_entryblock);

    /* Order of basic blocks must have been determined by now */
    if (normalize_jumps(g) < 0) {
 // - can't invoke arbitrary code (besides finalizers)
 // - only touch the TOS (and pop it when finished)
 #define SWAPPABLE(opcode) \
    ((opcode) == STORE_FAST || (opcode) == POP_TOP)
    ((opcode) == STORE_FAST || \
     (opcode) == STORE_FAST_MAYBE_NULL || \
     (opcode) == POP_TOP)

 static int
 next_swappable_instruction(basicblock *block, int i, int lineno)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -242,6 +242,8 @@ def pseudo_op(name, op, real_ops):

		pseudo_op('LOAD_METHOD', 262, ['LOAD_ATTR'])

		pseudo_op('STORE_FAST_MAYBE_NULL', 263, ['STORE_FAST'])

		MAX_PSEUDO_OPCODE = MIN_PSEUDO_OPCODE + len(_pseudo_ops) - 1

		del def_op, name_op, jrel_op, jabs_op, pseudo_op
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -195,6 +195,18 @@
		"""


		class ListComprehensionTest(unittest.TestCase):
		def test_unbound_local_after_comprehension(self):
		def f():
		if False:
		x = 0
		[x for x in [1]]
		return x
carljm marked this conversation as resolved. Show resolvedHide resolved

		with self.assertRaises(UnboundLocalError):
		f()


		__test__ = {'doctests' : doctests}

		def load_tests(loader, tests, pattern):
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2538,6 +2538,8 @@ def test_continuation_lines_indentation(self):
		def get_tokens(string):
		return [(kind, string) for (kind, string, *_) in _generate_tokens_from_c_tokenizer(string)]

		import dis; dis.dis(get_tokens)

		code = dedent("""
		def fib(n):
		\\
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1232,6 +1232,7 @@ stack_effect(int opcode, int oparg, int jump)
		case LOAD_FAST_OR_NULL:
		return 1;
		case STORE_FAST:
		case STORE_FAST_MAYBE_NULL:
		return -1;
		case DELETE_FAST:
		return 0;
Expand DownExpand Up		@@ -5486,7 +5487,7 @@ pop_inlined_comprehension_state(struct compiler *c, location loc,
		// could be cleverer about minimizing swaps but it doesn't matter
		// because `apply_static_swaps` will eliminate all of these anyway
		ADDOP_I(c, loc, SWAP, 2);
		ADDOP_NAME(c, loc,STORE_FAST, k, varnames);
		ADDOP_NAME(c, loc,STORE_FAST_MAYBE_NULL, k, varnames);
		}
		}
		return SUCCESS;
Expand DownExpand Up		@@ -7680,12 +7681,14 @@ push_cold_blocks_to_end(cfg_builder *g, int code_flags) {
		}

		static void
		convert_exception_handlers_to_nops(basicblock *entryblock) {
		convert_pseudo_ops(basicblock *entryblock) {
		for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
		for (int i = 0; i < b->b_iused; i++) {
		struct instr *instr = &b->b_instr[i];
		if (is_block_push(instr) \|\| instr->i_opcode == POP_BLOCK) {
		INSTR_SET_OP0(instr, NOP);
		} else if (instr->i_opcode == STORE_FAST_MAYBE_NULL) {
		instr->i_opcode = STORE_FAST;
		}
		}
		}
Expand DownExpand Up		@@ -8969,7 +8972,7 @@ assemble(struct compiler *c, int addNone)
		}
		/* TO DO -- For 3.12, make sure that `maxdepth <= MAX_ALLOWED_STACK_USE` */

		convert_exception_handlers_to_nops(g->g_entryblock);
		convert_pseudo_ops(g->g_entryblock);

		/* Order of basic blocks must have been determined by now */
		if (normalize_jumps(g) < 0) {
Expand DownExpand Up		@@ -9236,7 +9239,9 @@ swaptimize(basicblock block, int ix)
		// - can't invoke arbitrary code (besides finalizers)
		// - only touch the TOS (and pop it when finished)
		#define SWAPPABLE(opcode) \
		((opcode) == STORE_FAST \|\| (opcode) == POP_TOP)
		((opcode) == STORE_FAST \|\| \
		(opcode) == STORE_FAST_MAYBE_NULL \|\| \
		(opcode) == POP_TOP)

		static int
		next_swappable_instruction(basicblock *block, int i, int lineno)
Expand Down