[pypy-svn] r76130 - pypy/branch/kill-caninline/pypy/jit/metainterp

[arigo at codespeak.net]

Author: arigo
Date: Mon Jul 12 12:16:53 2010
New Revision: 76130

Modified:
   pypy/branch/kill-caninline/pypy/jit/metainterp/warmstate.py
Log:
No-op simplification.


Modified: pypy/branch/kill-caninline/pypy/jit/metainterp/warmstate.py
==============================================================================
--- pypy/branch/kill-caninline/pypy/jit/metainterp/warmstate.py	(original)
+++ pypy/branch/kill-caninline/pypy/jit/metainterp/warmstate.py	Mon Jul 12 12:16:53 2010
@@ -475,7 +475,7 @@
             return
         #
         unwrap_greenkey = self.make_unwrap_greenkey()
-        jit_getter = self.make_jitcell_getter()
+        self.make_jitcell_getter()
         jit_getter_maybe = self.jit_getter_maybe
 
         def can_inline_greenargs(*greenargs):
@@ -491,8 +491,8 @@
 
         def get_assembler_token(greenkey):
             greenargs = unwrap_greenkey(greenkey)
-            cell = jit_getter(*greenargs)
-            if cell.counter >= 0:
+            cell = jit_getter_maybe(*greenargs)
+            if cell is None or cell.counter >= 0:
                 return None
             return cell.entry_loop_token
         self.get_assembler_token = get_assembler_token