GH-98831: Revert "GH-98831: Update generate_cases.py: register inst, opcode_metadata.h (#100735)"

Makefile.pre.in

@@ -1456,15 +1456,6 @@ regen-cases:
  -i $(srcdir)/Python/bytecodes.c \
  -o $(srcdir)/Python/generated_cases.c.h.new
  $(UPDATE_FILE) $(srcdir)/Python/generated_cases.c.h $(srcdir)/Python/generated_cases.c.h.new
- # Regenerate Python/opcode_metadata.h from Python/bytecodes.c
- # using Tools/cases_generator/generate_cases.py --metadata
- PYTHONPATH=$(srcdir)/Tools/cases_generator \
- $(PYTHON_FOR_REGEN) \
- $(srcdir)/Tools/cases_generator/generate_cases.py \
- --metadata \
- -i $(srcdir)/Python/bytecodes.c \
- -o $(srcdir)/Python/opcode_metadata.h.new
- $(UPDATE_FILE) $(srcdir)/Python/opcode_metadata.h $(srcdir)/Python/opcode_metadata.h.new
 
 Python/ceval.o: $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/condvar.h $(srcdir)/Python/generated_cases.c.h
 

Python/bytecodes.c

@@ -764,7 +764,7 @@ dummy_func(
  ERROR_IF(w == NULL, error);
  }
 
- inst(YIELD_VALUE, (retval -- unused)){
+ inst(YIELD_VALUE, (retval --)){
  // NOTE: It's important that YIELD_VALUE never raises an exception!
  // The compiler treats any exception raised here as a failed close()
  // or throw() call.

Python/compile.c

@@ -36,8 +36,6 @@
 #include "pycore_pymem.h" // _PyMem_IsPtrFreed()
 #include "pycore_symtable.h" // PySTEntryObject
 
-#include "opcode_metadata.h" // _PyOpcode_opcode_metadata
-
 
 #define DEFAULT_BLOCK_SIZE 16
 #define DEFAULT_CODE_SIZE 128
@@ -8666,31 +8664,6 @@ no_redundant_jumps(cfg_builder *g){
  return true;
 }
 
-static bool
-opcode_metadata_is_sane(cfg_builder *g){
- for (basicblock *b = g->g_entryblock; b != NULL; b = b->b_next){
- for (int i = 0; i < b->b_iused; i++){
- struct instr *instr = &b->b_instr[i];
- int opcode = instr->i_opcode;
- assert(opcode <= MAX_REAL_OPCODE); 
- int pushed = _PyOpcode_opcode_metadata[opcode].n_pushed;
- int popped = _PyOpcode_opcode_metadata[opcode].n_popped;
- assert((pushed < 0) == (popped < 0));
- if (pushed >= 0){
- assert(_PyOpcode_opcode_metadata[opcode].valid_entry);
- int effect = stack_effect(opcode, instr->i_oparg, -1);
- if (effect != pushed - popped){
- fprintf(stderr,
- "op=%d: stack_effect (%d) != pushed (%d) - popped (%d)\n",
- opcode, effect, pushed, popped);
- return false;
- }
- }
- }
- }
- return true;
-}
-
 static bool
 no_empty_basic_blocks(cfg_builder *g){
  for (basicblock *b = g->g_entryblock; b != NULL; b = b->b_next){
@@ -8874,7 +8847,6 @@ assemble(struct compiler *c, int addNone)
  }
 
  assert(no_redundant_jumps(g));
- assert(opcode_metadata_is_sane(g));
 
  /* Can't modify the bytecode after computing jump offsets. */
  assemble_jump_offsets(g->g_entryblock);