[pypy-commit] pypy default: no-op: move around some methods to a more natural class

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r79782:b4e07df5f525
Date: 2015-09-23 11:01 +0200
http://bitbucket.org/pypy/pypy/changeset/b4e07df5f525/

Log:	no-op: move around some methods to a more natural class

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
@@ -48,9 +48,6 @@
     def is_null(self):
         return False
 
-    def is_virtual(self):
-        return False
-
     def force_at_the_end_of_preamble(self, op, optforce, rec):
         if not self.is_virtual():
             return optforce.get_box_replacement(op)
@@ -110,11 +107,6 @@
         self.last_guard_pos = len(optimizer._newoperations) - 1
         assert self.get_last_guard(optimizer).is_guard()
 
-    def visitor_walk_recursive(self, instbox, visitor, optimizer):
-        if visitor.already_seen_virtual(instbox):
-            return
-        return self._visitor_walk_recursive(instbox, visitor, optimizer)
-
     def make_guards(self, op, short, optimizer):
         op = ResOperation(rop.GUARD_NONNULL, [op], None)
         short.append(op)
@@ -160,6 +152,15 @@
     def is_virtual(self):
         return self._is_virtual
 
+    def _visitor_walk_recursive(self, op, visitor, optimizer):
+        raise NotImplementedError("abstract")
+
+    def visitor_walk_recursive(self, instbox, visitor, optimizer):
+        if visitor.already_seen_virtual(instbox):
+            return
+        return self._visitor_walk_recursive(instbox, visitor, optimizer)
+
+
 class AbstractStructPtrInfo(AbstractVirtualPtrInfo):
     _attrs_ = ('_fields',)
 
@@ -353,9 +354,6 @@
         return visitor.visit_vstruct(self.descr, fielddescrs)
 
 class AbstractRawPtrInfo(AbstractVirtualPtrInfo):
-    def _visitor_walk_recursive(self, op, visitor, optimizer):
-        raise NotImplementedError("abstract")
-
     @specialize.argtype(1)
     def visitor_dispatch_virtual_type(self, visitor):
         raise NotImplementedError("abstract")