[pypy-commit] pypy optimizeopt-cleanup: clean up dead code

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: optimizeopt-cleanup
Changeset: r96735:de70eeda44e7
Date: 2019-05-28 18:42 +0100
http://bitbucket.org/pypy/pypy/changeset/de70eeda44e7/

Log:	clean up dead code

diff --git a/rpython/jit/metainterp/optimizeopt/info.py b/rpython/jit/metainterp/optimizeopt/info.py
--- a/rpython/jit/metainterp/optimizeopt/info.py
+++ b/rpython/jit/metainterp/optimizeopt/info.py
@@ -534,7 +534,7 @@
     def _force_elements(self, op, optforce, descr):
         # XXX
         descr = op.getdescr()
-        const = optforce.new_const_item(self.descr)
+        const = optforce.optimizer.new_const_item(self.descr)
         for i in range(self.length):
             item = self._items[i]
             if item is None:
diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -166,18 +166,6 @@
     def get_constant_box(self, box):
         return self.optimizer.get_constant_box(box)
 
-    def new_box(self, fieldofs):
-        return self.optimizer.new_box(fieldofs)
-
-    def new_const(self, fieldofs):
-        return self.optimizer.new_const(fieldofs)
-
-    def new_box_item(self, arraydescr):
-        return self.optimizer.new_box_item(arraydescr)
-
-    def new_const_item(self, arraydescr):
-        return self.optimizer.new_const_item(arraydescr)
-
     def pure(self, opnum, result):
         if self.optimizer.optpure:
             self.optimizer.optpure.pure(opnum, result)
@@ -357,14 +345,6 @@
         return None
         #self.ensure_imported(value)
 
-    def get_newoperations(self):
-        self.flush()
-        return self._newoperations
-
-    def clear_newoperations(self):
-        self._newoperations = []
-        self._emittedoperations = {}
-
     def make_equal_to(self, op, newop):
         op = get_box_replacement(op)
         if op is newop:
@@ -623,32 +603,6 @@
             self._last_guard_op = None
         return op
 
-    def potentially_change_ovf_op_to_no_ovf(self, op):
-        # if last emitted operations was int_xxx_ovf and we are not emitting
-        # a guard_no_overflow change to int_add
-        if op.getopnum() != rop.GUARD_NO_OVERFLOW:
-            return
-        if not self._newoperations:
-            # got optimized otherwise
-            return
-        op = self._newoperations[-1]
-        if not op.is_ovf():
-            return
-        newop = self.replace_op_with_no_ovf(op)
-        self._newoperations[-1] = newop
-        self._emittedoperations[newop] = None
-
-    def replace_op_with_no_ovf(self, op):
-        if op.getopnum() == rop.INT_MUL_OVF:
-            return self.replace_op_with(op, rop.INT_MUL)
-        elif op.getopnum() == rop.INT_ADD_OVF:
-            return self.replace_op_with(op, rop.INT_ADD)
-        elif op.getopnum() == rop.INT_SUB_OVF:
-            return self.replace_op_with(op, rop.INT_SUB)
-        else:
-            assert False
-
-
     def _copy_resume_data_from(self, guard_op, last_guard_op):
         last_descr = last_guard_op.getdescr()
         descr = compile.invent_fail_descr_for_op(guard_op.getopnum(), self, last_descr)
diff --git a/rpython/jit/metainterp/optimizeopt/virtualize.py b/rpython/jit/metainterp/optimizeopt/virtualize.py
--- a/rpython/jit/metainterp/optimizeopt/virtualize.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualize.py
@@ -28,7 +28,7 @@
             assert clear
             opinfo = info.ArrayStructInfo(arraydescr, size, is_virtual=True)
         else:
-            const = self.new_const_item(arraydescr)
+            const = self.optimizer.new_const_item(arraydescr)
             opinfo = info.ArrayPtrInfo(arraydescr, const, size, clear,
                                        is_virtual=True)
         # Replace 'source_op' with a version in which the length is
@@ -393,7 +393,7 @@
                 if fld is None:
                     raise Exception("I think this is illegal")
                     xxx
-                    fieldvalue = self.new_const(descr)
+                    fieldvalue = self.optimizer.new_const(descr)
                 self.make_equal_to(op, fld)
                 return
         self.make_nonnull(op.getarg(0))