Fix binary subscr code gen

Summary: 3.14 has folded `BINARY_SUBSCR` in with the other binary ops.

Reviewed By: alexmalyshev

Differential Revision: D80753197

fbshipit-source-id: 9bfd7208c0390c4be0f938f6daf44ee4a77f7f88

Author: DinoV

cinderx/PythonLib/cinderx/compiler/pycodegen.py

@@ -818,6 +818,9 @@ def emit_test(self, node: ast.BoolOp, is_if_true: bool) -> None:
     def visitBoolOp(self, node: ast.BoolOp) -> None:
         raise NotImplementedError()
 
+    def emit_binary_subscr(self) -> None:
+        raise NotImplementedError()
+
     def emit_bin_op(self, binop: type[ast.operator]) -> None:
         raise NotImplementedError()
 
@@ -1971,7 +1974,7 @@ def _pattern_helper_sequence_subscr(
                 self.emit("GET_LEN")
                 self.emit("LOAD_CONST", size - i)
                 self.emit_bin_op(ast.Sub)
-            self.emit("BINARY_SUBSCR")
+            self.emit_binary_subscr()
             self.set_pos(pattern)
             self._visit_subpattern(pattern, pc)
             self.set_pos(node)
@@ -3475,6 +3478,9 @@ def unaryOp(self, node: ast.UnaryOp, op: str) -> None:
         ast.BitAnd: "BINARY_AND",
     }
 
+    def emit_binary_subscr(self) -> None:
+        self.emit("BINARY_SUBSCR")
+
     def emit_bin_op(self, binop: type[ast.operator]) -> None:
         op = self._binary_opcode[binop]
         self.emit(op)
@@ -3654,11 +3660,11 @@ def visitSubscript(self, node: ast.Subscript, aug_flag: bool = False) -> None:
         self.visit(node.value)
         self.visit(node.slice)
         if isinstance(node.ctx, ast.Load):
-            self.emit("BINARY_SUBSCR")
+            self.emit_binary_subscr()
         elif isinstance(node.ctx, ast.Store):
             if aug_flag:
                 self.emit_dup(2)
-                self.emit("BINARY_SUBSCR")
+                self.emit_binary_subscr()
             else:
                 self.emit("STORE_SUBSCR")
         elif isinstance(node.ctx, ast.Del):
@@ -3748,7 +3754,7 @@ def emit_finish_match_class(self, node: ast.MatchClass, pc: PatternContext) -> N
                 continue
             self.emit_dup()
             self.emit("LOAD_CONST", i)
-            self.emit("BINARY_SUBSCR")
+            self.emit_binary_subscr()
             self._visit_subpattern(pattern, pc)
         # Success! Pop the tuple of attributes:
         pc.on_top -= 1
@@ -3773,7 +3779,7 @@ def emit_finish_match_mapping(
                 continue
             self.emit_dup()
             self.emit("LOAD_CONST", i)
-            self.emit("BINARY_SUBSCR")
+            self.emit_binary_subscr()
             self._visit_subpattern(pattern, pc)
 
         # If we get this far, it's a match! We're done with the tuple of values,
@@ -4124,7 +4130,7 @@ def emitAugSubscript(self, node: ast.AugAssign) -> None:
             self.visit(subs.slice)
             self.emit("COPY", 2)
             self.emit("COPY", 2)
-            self.emit("BINARY_SUBSCR")
+            self.emit_binary_subscr()
 
         self.emitAugRHS(node)
 
@@ -4156,7 +4162,7 @@ def visitSubscript(self, node: ast.Subscript, aug_flag: bool = False) -> None:
         self.visit(node.slice)
 
         if isinstance(node.ctx, ast.Load):
-            self.emit("BINARY_SUBSCR")
+            self.emit_binary_subscr()
         elif isinstance(node.ctx, ast.Store):
             self.emit("STORE_SUBSCR")
         elif isinstance(node.ctx, ast.Del):
@@ -4204,6 +4210,9 @@ def emit_yield(self, scope: Scope) -> None:
         ast.BitAnd: find_op_idx("NB_AND"),
     }
 
+    def emit_binary_subscr(self) -> None:
+        self.emit("BINARY_SUBSCR")
+
     def emit_bin_op(self, binop: type[ast.operator]) -> None:
         op = self._binary_opargs[binop]
         self.emit("BINARY_OP", op)
@@ -5923,6 +5932,9 @@ def optimize_tree(
         assert isinstance(result, AST)
         return result
 
+    def emit_binary_subscr(self) -> None:
+        self.emit("BINARY_OP", self.find_op_idx("NB_SUBSCR"))
+
     def emit_kwonlydefaults(self, node: FuncOrLambda) -> bool:
         default_count = 0
         for kwonly, default in zip(node.args.kwonlyargs, node.args.kw_defaults):