[pypy-svn] r68454 - in pypy/branch/prevent-silly-unrolling/pypy: jit/metainterp module/pypyjit

[pedronis at codespeak.net]

Author: pedronis
Date: Wed Oct 14 18:31:40 2009
New Revision: 68454

Modified:
   pypy/branch/prevent-silly-unrolling/pypy/jit/metainterp/policy.py
   pypy/branch/prevent-silly-unrolling/pypy/module/pypyjit/policy.py
Log:
(pedronis, cfbolz): a bit further cleanup


Modified: pypy/branch/prevent-silly-unrolling/pypy/jit/metainterp/policy.py
==============================================================================
--- pypy/branch/prevent-silly-unrolling/pypy/jit/metainterp/policy.py	(original)
+++ pypy/branch/prevent-silly-unrolling/pypy/jit/metainterp/policy.py	Wed Oct 14 18:31:40 2009
@@ -27,6 +27,18 @@
         mod = func.__module__ or '?'
         if mod.startswith('pypy.rpython.module.'):
             return False
+        if mod == 'pypy.rpython.lltypesystem.module.ll_math':
+            # XXX temporary, contains force_cast
+            return False
+        if mod.startswith('pypy.translator.'): # XXX wtf?
+            return False
+        # string builder interface
+        if mod == 'pypy.rpython.lltypesystem.rbuilder':
+            return False
+        # rweakvaluedict implementation
+        if mod == 'pypy.rlib.rweakrefimpl':
+            return False
+        
         return True
 
     def look_inside_graph(self, graph, supports_floats):

Modified: pypy/branch/prevent-silly-unrolling/pypy/module/pypyjit/policy.py
==============================================================================
--- pypy/branch/prevent-silly-unrolling/pypy/module/pypyjit/policy.py	(original)
+++ pypy/branch/prevent-silly-unrolling/pypy/module/pypyjit/policy.py	Wed Oct 14 18:31:40 2009
@@ -13,6 +13,8 @@
         return False
 
     def look_inside_function(self, func):
+        # this function should never actually return True directly
+        # but instead call the base implementation
         mod = func.__module__ or '?'
         
         if mod.startswith('pypy.objspace.'):
@@ -22,9 +24,6 @@
         if mod == 'pypy.rlib.rbigint':
             #if func.__name__ == '_bigint_true_divide':
             return False
-        if mod == 'pypy.rpython.lltypesystem.module.ll_math':
-            # XXX temporary, contains force_cast
-            return False
         if '_geninterp_' in func.func_globals: # skip all geninterped stuff
             return False
         if mod.startswith('pypy.interpreter.astcompiler.'):
@@ -36,13 +35,4 @@
             if not self.look_inside_pypy_module(modname):
                 return False
             
-        if mod.startswith('pypy.translator.'): # XXX wtf?
-            return False
-        # string builder interface
-        if mod == 'pypy.rpython.lltypesystem.rbuilder':
-            return False
-        # rweakvaluedict implementation
-        if mod == 'pypy.rlib.rweakrefimpl':
-            return False
-        
         return super(PyPyJitPolicy, self).look_inside_function(func)