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

[arigo at codespeak.net]

Author: arigo
Date: Fri Mar  6 16:45:34 2009
New Revision: 62651

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/resoperation.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_vable_optimize.py
Log:
Rename this field.


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py	Fri Mar  6 16:45:34 2009
@@ -530,7 +530,7 @@
                     instnode.virtualized = True
                 if instnode.cls is None:
                     instnode.cls = InstanceNode(op.args[1], const=True)
-                    instnode.vdesc = op.desc
+                    instnode.vdesc = op.vdesc
                 continue
             elif op.is_always_pure():
                 for arg in op.args:

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py	Fri Mar  6 16:45:34 2009
@@ -519,7 +519,7 @@
         op = self.generate_guard(pc, rop.GUARD_NONVIRTUALIZED, box,
                                  [clsbox, guard_field])
         if op:
-            op.desc = vdesc
+            op.vdesc = vdesc
         
     @arguments("box")
     def opimpl_keepalive(self, box):

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/resoperation.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/resoperation.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/resoperation.py	Fri Mar  6 16:45:34 2009
@@ -15,7 +15,7 @@
     liveboxes = None
 
     # for 'guard_nonvirtualizable'
-    desc = None
+    vdesc = None
 
     def __init__(self, opnum, args, result):
         assert isinstance(opnum, int)

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_vable_optimize.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_vable_optimize.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_vable_optimize.py	Fri Mar  6 16:45:34 2009
@@ -97,7 +97,7 @@
         ResOperation('setfield_gc', [fr, ConstInt(ofs_node), n2], None),
         ResOperation('jump', [sum2, fr], None),
         ]
-    ops[1].desc = xy_desc
+    ops[1].vdesc = xy_desc
 
 def test_A_find_nodes():
     spec = PerfectSpecializer(Loop(A.ops))
@@ -148,7 +148,7 @@
         ResOperation('getfield_gc', [n1, ConstInt(ofs_value)], v),
         ResOperation('jump', [fr], None),
         ]
-    ops[1].desc = xy_desc
+    ops[1].vdesc = xy_desc
 
 def test_B_intersect_input_and_output():
     spec = PerfectSpecializer(Loop(B.ops))
@@ -185,7 +185,7 @@
         #
         ResOperation('jump', [fr], None),
         ]
-    ops[1].desc = xy_desc
+    ops[1].vdesc = xy_desc
 
 def test_C_intersect_input_and_output():
     spec = PerfectSpecializer(Loop(C.ops))
@@ -224,7 +224,7 @@
         ResOperation('setitem', [None, l, ConstInt(0), v2], None),
         ResOperation('jump', [fr], None),
         ]
-    ops[1].desc = xy_desc
+    ops[1].vdesc = xy_desc
 
 def test_D_intersect_input_and_output():
     py.test.skip("XXX")