[pypy-svn] r79742 - in pypy/branch/out-of-line-guards/pypy/rpython: lltypesystem test

[fijal at codespeak.net]

Author: fijal
Date: Thu Dec  2 14:08:51 2010
New Revision: 79742

Modified:
   pypy/branch/out-of-line-guards/pypy/rpython/lltypesystem/rclass.py
   pypy/branch/out-of-line-guards/pypy/rpython/test/test_rclass.py
Log:
Revert last checkin changes, jit_invariant_field sounds better


Modified: pypy/branch/out-of-line-guards/pypy/rpython/lltypesystem/rclass.py
==============================================================================
--- pypy/branch/out-of-line-guards/pypy/rpython/lltypesystem/rclass.py	(original)
+++ pypy/branch/out-of-line-guards/pypy/rpython/lltypesystem/rclass.py	Thu Dec  2 14:08:51 2010
@@ -517,8 +517,7 @@
         # for virtualizables; see rvirtualizable2.py
         if (op == 'setfield' and cname.value.startswith('inst_') and
             cname.value[len('inst_'):] in self.jit_invariant_fields):
-            llops.genop('jit_marker', [Constant('invariant_setfield',
-                                                lltype.Void)])
+            llops.genop('jit_invariant_setfield', [])
 
     def new_instance(self, llops, classcallhop=None):
         """Build a new instance, without calling __init__."""

Modified: pypy/branch/out-of-line-guards/pypy/rpython/test/test_rclass.py
==============================================================================
--- pypy/branch/out-of-line-guards/pypy/rpython/test/test_rclass.py	(original)
+++ pypy/branch/out-of-line-guards/pypy/rpython/test/test_rclass.py	Thu Dec  2 14:08:51 2010
@@ -1070,11 +1070,10 @@
         t, typer, graph = self.gengraph(f, [])
         block = graph.iterblocks().next()
         for op in block.operations:
-            if op.opname == 'jit_marker':
-                assert op.args[0].value == 'invariant_setfield'
+            if op.opname == 'jit_invariant_setfield':
                 break
         else:
-            raise Exception("did not find jit invariant setfield marker")
+            raise Exception("did not find jit invariant setfield")
 
 class TestOOtype(BaseTestRclass, OORtypeMixin):
     def test__del__(self):