[pypy-svn] r63836 - in pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp: . test

[antocuni at codespeak.net]

Author: antocuni
Date: Wed Apr  8 16:25:20 2009
New Revision: 63836

Modified:
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/policy.py
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_basic.py
Log:
two more passing tests


Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/policy.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/policy.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/policy.py	Wed Apr  8 16:25:20 2009
@@ -1,3 +1,4 @@
+from pypy.translator.simplify import get_funcobj
 
 class JitPolicy(object):
 
@@ -22,7 +23,8 @@
 
     def graphs_from(self, op):
         if op.opname == 'direct_call':
-            graph = op.args[0].value._obj.graph
+            funcobj = get_funcobj(op.args[0].value)
+            graph = funcobj.graph
             if self.look_inside_graph(graph):
                 return [graph]     # common case: look inside this graph
         else:
@@ -36,7 +38,7 @@
 
     def guess_call_kind(self, op):
         if op.opname == 'direct_call':
-            funcobj = op.args[0].value._obj
+            funcobj = get_funcobj(op.args[0].value)
             if (hasattr(funcobj, '_callable') and
                 getattr(funcobj._callable, '_recursive_portal_call_', False)):
                 return 'recursive'

Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_basic.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_basic.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_basic.py	Wed Apr  8 16:25:20 2009
@@ -462,8 +462,6 @@
     def skip(self):
         py.test.skip('in-progress')
 
-    test_direct_call = skip
-    test_direct_call_with_guard = skip
     test_string = skip
     test_residual_call = skip
     test_format = skip