[pypy-svn] r65914 - pypy/branch/pyjitpl5/pypy/jit/metainterp

[antocuni at codespeak.net]

Author: antocuni
Date: Wed Jun 24 16:47:07 2009
New Revision: 65914

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/warmspot.py
Log:
this is needed to compile pypy-cli-jit


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/warmspot.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/warmspot.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/warmspot.py	Wed Jun 24 16:47:07 2009
@@ -22,8 +22,7 @@
 from pypy.jit.metainterp.policy import JitPolicy
 from pypy.jit.metainterp.typesystem import LLTypeHelper, OOTypeHelper
 from pypy.jit.metainterp.jitprof import Profiler
-from pypy.jit.metainterp.typesystem import deref#, getlength
-#from pypy.jit.metainterp.typesystem import getarrayitem, setarrayitem
+from pypy.jit.metainterp.typesystem import deref
 
 # ____________________________________________________________
 # Bootstrapping
@@ -629,7 +628,10 @@
             return TYPE == self.VTYPEPTR
         else:
             # ootype: any subtype may be used too
-            return ootype.isSubclass(TYPE, self.VTYPE)
+            if isinstance(TYPE, ootype.Instance) and isinstance(self.VTYPE, ootype.Instance):
+                return ootype.isSubclass(TYPE, self.VTYPE)
+            else:
+                return TYPE == self.VTYPE
 
 
 def decode_hp_hint_args(op):