[pypy-svn] r15777 - pypy/dist/pypy/rpython/memory

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Aug  8 17:09:26 2005
New Revision: 15777

Modified:
   pypy/dist/pypy/rpython/memory/convertlltype.py
Log:
don't try to convert constant functions in the graph.


Modified: pypy/dist/pypy/rpython/memory/convertlltype.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/convertlltype.py	(original)
+++ pypy/dist/pypy/rpython/memory/convertlltype.py	Mon Aug  8 17:09:26 2005
@@ -8,7 +8,7 @@
 from pypy.objspace.flow.model import Constant
 from pypy.rpython import lltype
 
-import struct
+import types, struct
 
 class LLTypeConverter(object):
     def __init__(self, address):
@@ -139,6 +139,8 @@
                 continue
             elif isinstance(cand, lltype.LowLevelType):
                 continue
+            elif isinstance(cand, types.FunctionType):
+                continue
             elif isinstance(cand, str):
                 continue
             elif isinstance(lltype.typeOf(cand), lltype.Primitive):
@@ -179,6 +181,8 @@
                 self.constants[constant] = constant.value
             elif isinstance(constant.value, str):
                 self.constants[constant] = constant.value
+            elif isinstance(constant.value, types.FunctionType):
+                self.constants[constant] = constant.value
             else:
                 self.constants[constant] = self.cvter.convert(constant.value)