[pypy-commit] pypy jit-usable_retrace_3: rename

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-usable_retrace_3
Changeset: r58384:7f959049e8ee
Date: 2012-10-23 15:44 +0200
http://bitbucket.org/pypy/pypy/changeset/7f959049e8ee/

Log:	rename

diff --git a/pypy/jit/metainterp/optimizeopt/unroll.py b/pypy/jit/metainterp/optimizeopt/unroll.py
--- a/pypy/jit/metainterp/optimizeopt/unroll.py
+++ b/pypy/jit/metainterp/optimizeopt/unroll.py
@@ -286,7 +286,7 @@
 
             virtual_state = self.initial_virtual_state
             values = [self.getvalue(arg) for arg in exported_state.jump_args]
-            virtual_state = virtual_state.make_generalization_of(exported_state.generalize_virtual_state,
+            virtual_state = virtual_state.make_guarded_generalization_of(exported_state.generalize_virtual_state,
                                                                  exported_state.jump_args,
                                                                  self.optimizer)
             values = [self.getvalue(arg) for arg in exported_state.jump_args]            
diff --git a/pypy/jit/metainterp/optimizeopt/virtualstate.py b/pypy/jit/metainterp/optimizeopt/virtualstate.py
--- a/pypy/jit/metainterp/optimizeopt/virtualstate.py
+++ b/pypy/jit/metainterp/optimizeopt/virtualstate.py
@@ -23,7 +23,7 @@
     def generalization_of(self, other, renum, bad):
         raise NotImplementedError
 
-    def make_generalization_of(self, other, value, optimizer):
+    def make_guarded_generalization_of(self, other, value, optimizer):
         pass
 
     def generate_guards(self, other, box, cpu, extra_guards, renum):
@@ -109,7 +109,7 @@
 
         return True
 
-    def make_generalization_of(self, other, value, optimizer):
+    def make_guarded_generalization_of(self, other, value, optimizer):
         if not self._generalization_of(other):
             raise InvalidLoop
         assert isinstance(other, AbstractVirtualStructStateInfo)
@@ -121,7 +121,7 @@
         for i in range(len(self.fielddescrs)):
             if other.fielddescrs[i] is not self.fielddescrs[i]:
                 raise InvalidLoop
-            new_field_value = self.fieldstate[i].make_generalization_of(other.fieldstate[i],
+            new_field_value = self.fieldstate[i].make_guarded_generalization_of(other.fieldstate[i],
                                                                         value.getfield(self.fielddescrs[i], None),
                                                                         optimizer)
             if new_field_value:
@@ -374,12 +374,12 @@
             return False
         return True
 
-    def make_generalization_of(self, other, value, optimizer):
+    def make_guarded_generalization_of(self, other, value, optimizer):
         if not self.generalization_of(other, {}, {}):
             box = value.get_key_box()
             try:
                 self._generate_guards(other, box, optimizer.cpu, [])
-                return # It is enough if we can generate guards to make states compatibe, FIXME: rename method
+                return 
             except InvalidLoop:
                 pass
             if isinstance(box, Const):
@@ -515,11 +515,11 @@
                 return False
         return True
 
-    def make_generalization_of(self, other, jumpargs, optimizer):
+    def make_guarded_generalization_of(self, other, jumpargs, optimizer):
         assert len(self.state) == len(other.state) == len(jumpargs)
         values = [optimizer.getvalue(arg) for arg in jumpargs]
         for i in range(len(self.state)):
-            new_value = self.state[i].make_generalization_of(other.state[i], values[i], optimizer)
+            new_value = self.state[i].make_guarded_generalization_of(other.state[i], values[i], optimizer)
             if new_value:
                 optimizer.make_equal_to(jumpargs[i], new_value, True)