3 files changed, 77 insertions, 51 deletions
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index 06fbeadfc..d9f81d8d4 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -1,28 +1,28 @@
 ----------------
-[   4] rule(2) (n=8)
-         tok(5)
-[   4]   rule(78) (n=4)
+[   4] rule(1) (n=8)
+         tok(4)
+[   4]   rule(22) (n=4)
            id(i)
-[   4]     rule(131) (n=1)
+[   4]     rule(44) (n=1)
              NULL
-[   5]     rule(42) (n=0)
+[   5]     rule(8) (n=0)
            NULL
-[   6]   rule(32) (n=2)
+[   6]   rule(5) (n=2)
            id(a)
-           tok(15)
-[   7]   rule(32) (n=2)
+           tok(14)
+[   7]   rule(5) (n=2)
            id(b)
            str(str)
-[   8]   rule(32) (n=2)
+[   8]   rule(5) (n=2)
            id(c)
-[   8]     literal str(a very long str that will not be interned)
-[   9]   rule(32) (n=2)
+[   8]     literal \.\+
+[   9]   rule(5) (n=2)
            id(d)
            bytes(bytes)
-[  10]   rule(32) (n=2)
+[  10]   rule(5) (n=2)
            id(e)
-[  10]     literal bytes(a very long bytes that will not be interned)
-[  11]   rule(32) (n=2)
+[  10]     literal \.\+
+[  11]   rule(5) (n=2)
            id(f)
 [  11]     literal \.\+
 ----------------
@@ -31,7 +31,7 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 ########
 \.\+5b
 arg names:
-(N_STATE 2)
+(N_STATE 5)
 (N_EXC_STACK 0)
   bc=-1 line=1
   bc=0 line=4
@@ -43,7 +43,7 @@ arg names:
   bc=32 line=10
   bc=37 line=11
 00 BUILD_TUPLE 0
-02 GET_ITER
+02 GET_ITER_STACK
 03 FOR_ITER 12
 06 STORE_NAME i
 09 JUMP 3
diff --git a/tests/cmdline/cmd_showbc.py b/tests/cmdline/cmd_showbc.py
index 2f4e953bb..6e99fc418 100644
--- a/tests/cmdline/cmd_showbc.py
+++ b/tests/cmdline/cmd_showbc.py
@@ -150,3 +150,7 @@ class Class:
 
 # delete name
 del Class
+
+# load super method
+def f(self):
+    super().f()
diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp
index 1f0c054cf..1e015eb03 100644
--- a/tests/cmdline/cmd_showbc.py.exp
+++ b/tests/cmdline/cmd_showbc.py.exp
@@ -7,7 +7,7 @@ arg names:
 (N_EXC_STACK 0)
   bc=-1 line=1
 ########
-  bc=\\d\+ line=152
+  bc=\\d\+ line=155
 00 MAKE_FUNCTION \.\+
 \\d\+ STORE_NAME f
 \\d\+ MAKE_FUNCTION \.\+
@@ -25,6 +25,8 @@ arg names:
 \\d\+ CALL_FUNCTION n=2 nkw=0
 \\d\+ STORE_NAME Class
 \\d\+ DELETE_NAME Class
+\\d\+ MAKE_FUNCTION \.\+
+\\d\+ STORE_NAME f
 \\d\+ LOAD_CONST_NONE
 \\d\+ RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ bytes)
@@ -175,14 +177,12 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 \\d\+ LOAD_FAST 15
 \\d\+ MAKE_CLOSURE \.\+ 2
 \\d\+ LOAD_FAST 2
-\\d\+ GET_ITER
 \\d\+ CALL_FUNCTION n=1 nkw=0
 \\d\+ STORE_FAST 0
 \\d\+ LOAD_FAST 14
 \\d\+ LOAD_FAST 15
 \\d\+ MAKE_CLOSURE \.\+ 2
 \\d\+ LOAD_FAST 2
-\\d\+ GET_ITER
 \\d\+ CALL_FUNCTION n=1 nkw=0
 \\d\+ STORE_FAST 0
 \\d\+ LOAD_FAST 0
@@ -245,7 +245,7 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 \\d\+ LOAD_FAST 0
 \\d\+ STORE_FAST 0
 \\d\+ LOAD_DEREF 14
-\\d\+ GET_ITER
+\\d\+ GET_ITER_STACK
 \\d\+ FOR_ITER \\d\+
 \\d\+ STORE_FAST 0
 \\d\+ LOAD_FAST 1
@@ -430,63 +430,85 @@ arg names:
 10 STORE_NAME __qualname__
 13 LOAD_CONST_NONE
 14 RETURN_VALUE
+File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ bytes)
+Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
+########
+\.\+5b
+arg names: self
+(N_STATE 4)
+(N_EXC_STACK 0)
+  bc=-1 line=1
+  bc=0 line=156
+00 LOAD_GLOBAL super (cache=0)
+\\d\+ LOAD_GLOBAL __class__ (cache=0)
+\\d\+ LOAD_FAST 0
+\\d\+ LOAD_SUPER_METHOD f
+\\d\+ CALL_METHOD n=0 nkw=0
+\\d\+ POP_TOP
+\\d\+ LOAD_CONST_NONE
+\\d\+ RETURN_VALUE
 File cmdline/cmd_showbc.py, code block '<genexpr>' (descriptor: \.\+, bytecode @\.\+ bytes)
 Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 ########
 \.\+5b
 arg names: * * *
-(N_STATE 6)
+(N_STATE 9)
 (N_EXC_STACK 0)
   bc=-\\d\+ line=1
-00 LOAD_FAST 2
-01 FOR_ITER 17
-04 STORE_FAST 3
-05 LOAD_DEREF 1
-07 POP_JUMP_IF_FALSE 1
-10 LOAD_DEREF 0
-12 YIELD_VALUE
-13 POP_TOP
-14 JUMP 1
-17 LOAD_CONST_NONE
-18 RETURN_VALUE
+00 LOAD_NULL
+01 LOAD_FAST 2
+02 LOAD_NULL
+03 LOAD_NULL
+04 FOR_ITER 20
+07 STORE_FAST 3
+08 LOAD_DEREF 1
+10 POP_JUMP_IF_FALSE 4
+13 LOAD_DEREF 0
+15 YIELD_VALUE
+16 POP_TOP
+17 JUMP 4
+20 LOAD_CONST_NONE
+21 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block '<listcomp>' (descriptor: \.\+, bytecode @\.\+ bytes)
 Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 ########
 \.\+5b
 arg names: * * *
-(N_STATE 7)
+(N_STATE 10)
 (N_EXC_STACK 0)
   bc=-\\d\+ line=1
 00 BUILD_LIST 0
 02 LOAD_FAST 2
-03 FOR_ITER 19
-06 STORE_FAST 3
-07 LOAD_DEREF 1
-09 POP_JUMP_IF_FALSE 3
-12 LOAD_DEREF 0
-14 STORE_COMP 8
-16 JUMP 3
-19 RETURN_VALUE
+03 GET_ITER_STACK
+04 FOR_ITER 20
+07 STORE_FAST 3
+08 LOAD_DEREF 1
+10 POP_JUMP_IF_FALSE 4
+13 LOAD_DEREF 0
+15 STORE_COMP 20
+17 JUMP 4
+20 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block '<dictcomp>' (descriptor: \.\+, bytecode @\.\+ bytes)
 Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 ########
 \.\+5b
 arg names: * * *
-(N_STATE 8)
+(N_STATE 11)
 (N_EXC_STACK 0)
   bc=-\\d\+ line=1
 ########
 00 BUILD_MAP 0
 02 LOAD_FAST 2
-03 FOR_ITER 21
-06 STORE_FAST 3
-07 LOAD_DEREF 1
-09 POP_JUMP_IF_FALSE 3
-12 LOAD_DEREF 0
-14 LOAD_DEREF 0
-16 STORE_COMP 13
-18 JUMP 3
-21 RETURN_VALUE
+03 GET_ITER_STACK
+04 FOR_ITER 22
+07 STORE_FAST 3
+08 LOAD_DEREF 1
+10 POP_JUMP_IF_FALSE 4
+13 LOAD_DEREF 0
+15 LOAD_DEREF 0
+17 STORE_COMP 25
+19 JUMP 4
+22 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'closure' (descriptor: \.\+, bytecode @\.\+ bytes)
 Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 ########