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

[antocuni at codespeak.net]

Author: antocuni
Date: Fri Apr 24 12:32:23 2009
New Revision: 64633

Modified:
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/codewriter.py
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_vlist.py
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/typesystem.py
Log:
smooth one ootype/lltype difference


Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/codewriter.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/codewriter.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/codewriter.py	Fri Apr 24 12:32:23 2009
@@ -11,7 +11,7 @@
 from pypy.tool.udir import udir
 from pypy.translator.simplify import get_funcobj, get_functype
 from pypy.translator.backendopt.canraise import RaiseAnalyzer
-from pypy.jit.metainterp.typesystem import deref
+from pypy.jit.metainterp.typesystem import deref, arrayItem
 
 import py, sys
 from pypy.tool.ansi_print import ansi_log
@@ -963,7 +963,7 @@
             if len(args) > 1:
                 v_default = args[1]
                 if (not isinstance(v_default, Constant) or
-                    v_default.value != ARRAY.OF._defl()):
+                    v_default.value != arrayItem(ARRAY)._defl()):
                     return False     # variable or non-null initial value
             self.emit('new_array')
             self.emit(self.get_position(arraydescr))

Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_vlist.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_vlist.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_vlist.py	Fri Apr 24 12:32:23 2009
@@ -360,7 +360,6 @@
     def skip(self):
         py.test.skip('in-progress')
     
-    test_cannot_be_virtual = skip
     test_ll_fixed_setitem_fast = skip
 
 

Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/typesystem.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/typesystem.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/typesystem.py	Fri Apr 24 12:32:23 2009
@@ -23,6 +23,12 @@
     else:
         assert False
 
+def arrayItem(ARRAY):
+    try:
+        return ARRAY.OF
+    except AttributeError:
+        return ARRAY.ITEM
+
 class TypeSystemHelper(object):
 
     def _freeze_(self):