[pypy-commit] pypy default: BogusPureField -> BogusImmutableField

[cfbolz]

Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: 
Changeset: r77431:471c38e1dbaa
Date: 2015-05-20 18:50 +0200
http://bitbucket.org/pypy/pypy/changeset/471c38e1dbaa/

Log:	BogusPureField -> BogusImmutableField

diff --git a/rpython/jit/metainterp/optimizeopt/heap.py b/rpython/jit/metainterp/optimizeopt/heap.py
--- a/rpython/jit/metainterp/optimizeopt/heap.py
+++ b/rpython/jit/metainterp/optimizeopt/heap.py
@@ -171,7 +171,7 @@
                 elif op.result is not None:
                     shortboxes.add_potential(op)
 
-class BogusPureField(JitException):
+class BogusImmutableField(JitException):
     pass
 
 
@@ -504,7 +504,7 @@
                                 op.getdescr()):
             os.write(2, '[bogus _immutable_field_ declaration: %s]\n' %
                      (op.getdescr().repr_of_descr()))
-            raise BogusPureField
+            raise BogusImmutableField
         #
         cf = self.field_cache(op.getdescr())
         cf.do_setfield(self, op)
@@ -557,7 +557,7 @@
                                 op.getdescr()):
             os.write(2, '[bogus immutable array declaration: %s]\n' %
                      (op.getdescr().repr_of_descr()))
-            raise BogusPureField
+            raise BogusImmutableField
         #
         indexvalue = self.getvalue(op.getarg(1))
         if indexvalue.is_constant():
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
@@ -4856,7 +4856,7 @@
         self.optimize_loop(ops, expected)
 
     def test_complains_getfieldpure_setfield(self):
-        from rpython.jit.metainterp.optimizeopt.heap import BogusPureField
+        from rpython.jit.metainterp.optimizeopt.heap import BogusImmutableField
         ops = """
         [p3]
         p1 = escape()
@@ -4864,7 +4864,7 @@
         setfield_gc(p1, p3, descr=nextdescr)
         jump(p3)
         """
-        self.raises(BogusPureField, self.optimize_loop, ops, "crash!")
+        self.raises(BogusImmutableField, self.optimize_loop, ops, "crash!")
 
     def test_dont_complains_different_field(self):
         ops = """