fixes

Author: JelleZijlstra

Include/internal/pycore_instruction_sequence.h

@@ -66,7 +66,8 @@ _PyJumpTargetLabel _PyInstructionSequence_NewLabel(_PyInstructionSequence *seq);
 int _PyInstructionSequence_ApplyLabelMap(_PyInstructionSequence *seq);
 int _PyInstructionSequence_InsertInstruction(_PyInstructionSequence *seq, int pos,
                                              int opcode, int oparg, _Py_SourceLocation loc);
-int _PyInstructionSequence_PrependSequence(_PyInstructionSequence *seq, _PyInstructionSequence *nested);
+int _PyInstructionSequence_PrependSequence(_PyInstructionSequence *seq, int pos,
+                                           _PyInstructionSequence *nested);
 int _PyInstructionSequence_AddNested(_PyInstructionSequence *seq, _PyInstructionSequence *nested);
 void PyInstructionSequence_Fini(_PyInstructionSequence *seq);
 

Lib/test/test_dis.py

@@ -382,24 +382,36 @@ def wrap_func_w_kwargs():
 # leading newline is for a reason (tests lineno)
 
 dis_annot_stmt_str = """\
-  0           RESUME                   0
+  --           MAKE_CELL                0 (__conditional_annotations__)
 
-  2           LOAD_SMALL_INT           1
-              STORE_NAME               0 (x)
+   0           RESUME                   0
 
-  4           LOAD_SMALL_INT           1
-              LOAD_NAME                1 (lst)
-              LOAD_NAME                2 (fun)
-              PUSH_NULL
-              LOAD_SMALL_INT           0
-              CALL                     1
-              STORE_SUBSCR
+   2           LOAD_CONST               1 (<code object __annotate__ at 0x..., file "<dis>", line 2>)
+               MAKE_FUNCTION
+               STORE_NAME               4 (__annotate__)
+               BUILD_SET                0
+               STORE_NAME               0 (__conditional_annotations__)
+               LOAD_SMALL_INT           1
+               STORE_NAME               1 (x)
+               LOAD_NAME                0 (__conditional_annotations__)
+               LOAD_SMALL_INT           0
+               SET_ADD                  1
+               POP_TOP
 
-  2           LOAD_CONST               1 (<code object __annotate__ at 0x..., file "<dis>", line 2>)
-              MAKE_FUNCTION
-              STORE_NAME               3 (__annotate__)
-              LOAD_CONST               2 (None)
-              RETURN_VALUE
+   3           LOAD_NAME                0 (__conditional_annotations__)
+               LOAD_SMALL_INT           1
+               SET_ADD                  1
+               POP_TOP
+
+   4           LOAD_SMALL_INT           1
+               LOAD_NAME                2 (lst)
+               LOAD_NAME                3 (fun)
+               PUSH_NULL
+               LOAD_SMALL_INT           0
+               CALL                     1
+               STORE_SUBSCR
+               LOAD_CONST               2 (None)
+               RETURN_VALUE
 """
 
 fn_with_annotate_str = """

Makefile.pre.in

@@ -2666,6 +2666,7 @@ TESTSUBDIRS=	idlelib/idle_test \
 		test/translationdata/getopt \
 		test/translationdata/optparse \
 		test/typinganndata \
+		test/typinganndata/partialexecution \
 		test/wheeldata \
 		test/xmltestdata \
 		test/xmltestdata/c14n-20 \

Python/codegen.c

@@ -829,7 +829,7 @@ codegen_process_deferred_annotations(compiler *c, location loc)
 
     if (nested_instr_seq != NULL) {
         RETURN_IF_ERROR(
-            _PyInstructionSequence_PrependSequence(old_instr_seq, nested_instr_seq));
+            _PyInstructionSequence_PrependSequence(old_instr_seq, 1, nested_instr_seq));
         _PyCompile_SetInstrSequence(c, old_instr_seq);
         PyInstructionSequence_Fini(nested_instr_seq);
     }

Python/instruction_sequence.c

@@ -160,23 +160,24 @@ _PyInstructionSequence_InsertInstruction(instr_sequence *seq, int pos,
 }
 
 int
-_PyInstructionSequence_PrependSequence(instr_sequence *seq,
+_PyInstructionSequence_PrependSequence(instr_sequence *seq, int pos,
                                        instr_sequence *nested)
 {
+    assert(pos >= 0 && pos <= seq->s_used);
+    // Merging labelmaps is not supported
+    assert(nested->s_labelmap_size == 0 && nested->s_nested == NULL);
     if (nested->s_used == 0) {
         return SUCCESS;
     }
-    // Merging labelmaps is not supported
-    assert(nested->s_labelmap_size == 0 && nested->s_nested == NULL);
 
     int last_idx = instr_sequence_grow(seq, nested->s_used);
 
     RETURN_IF_ERROR(last_idx);
-    for (int i = last_idx - nested->s_used; i >= 0; i--) {
+    for (int i = last_idx - nested->s_used; i >= pos; i--) {
         seq->s_instrs[i + nested->s_used] = seq->s_instrs[i];
     }
     for (int i=0; i < nested->s_used; i++) {
-        seq->s_instrs[i] = nested->s_instrs[i];
+        seq->s_instrs[i + pos] = nested->s_instrs[i];
     }
     for(int lbl=0; lbl < seq->s_labelmap_size; lbl++) {
         seq->s_labelmap[lbl] += nested->s_used;