[pypy-commit] pypy default: kill consider_call_site_for_pbc()

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: 
Changeset: r76614:e420df7b3011
Date: 2015-03-28 21:39 +0000
http://bitbucket.org/pypy/pypy/changeset/e420df7b3011/

Log:	kill consider_call_site_for_pbc()

diff --git a/rpython/annotator/bookkeeper.py b/rpython/annotator/bookkeeper.py
--- a/rpython/annotator/bookkeeper.py
+++ b/rpython/annotator/bookkeeper.py
@@ -111,8 +111,7 @@
 
             for pbc, args_s in self.emulated_pbc_calls.itervalues():
                 args = simple_args(args_s)
-                self.consider_call_site_for_pbc(pbc, args,
-                                                s_ImpossibleValue, None)
+                pbc.consider_call_site(args, s_ImpossibleValue, None)
             self.emulated_pbc_calls = {}
         finally:
             self.leave()
@@ -163,13 +162,7 @@
             if s_result is None:
                 s_result = s_ImpossibleValue
             args = call_op.build_args(args_s)
-            self.consider_call_site_for_pbc(s_callable, args,
-                                            s_result, call_op)
-
-    def consider_call_site_for_pbc(self, s_callable, args, s_result,
-                                   call_op):
-        descs = list(s_callable.descriptions)
-        s_callable.getKind().consider_call_site(descs, args, s_result, call_op)
+            s_callable.consider_call_site(args, s_result, call_op)
 
     def getuniqueclassdef(self, cls):
         """Get the ClassDef associated with the given user cls.
diff --git a/rpython/annotator/model.py b/rpython/annotator/model.py
--- a/rpython/annotator/model.py
+++ b/rpython/annotator/model.py
@@ -495,6 +495,10 @@
         if len(self.descriptions) > 1:
             kind.simplify_desc_set(self.descriptions)
 
+    def consider_call_site(self, args, s_result, call_op):
+        descs = list(self.descriptions)
+        self.getKind().consider_call_site(descs, args, s_result, call_op)
+
     def can_be_none(self):
         return self.can_be_None
 
@@ -588,7 +592,7 @@
 
 
 class SomeProperty(SomeObject):
-    # used for union error only 
+    # used for union error only
     immutable = True
     knowntype = type(property)