[pypy-svn] pypy out-of-line-guards-2: - Improve a bit the tests.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: out-of-line-guards-2
Changeset: r43849:75c9ec8ace14
Date: 2011-05-02 15:59 +0200
http://bitbucket.org/pypy/pypy/changeset/75c9ec8ace14/

Log:	- Improve a bit the tests.
	- Kill old tests.

diff --git a/pypy/jit/metainterp/test/test_optimizeopt.py b/pypy/jit/metainterp/test/test_optimizeopt.py
--- a/pypy/jit/metainterp/test/test_optimizeopt.py
+++ b/pypy/jit/metainterp/test/test_optimizeopt.py
@@ -5724,11 +5724,13 @@
         quasiimmut_field(p0, descr=quasiimmutdescr)
         guard_not_invalidated() []
         i1 = getfield_gc(p0, descr=quasifielddescr)
+        escape(i1)
         jump(p1, p0, i1)
         """
         expected = """
         [p0, p1, i0]
         i1 = getfield_gc(p0, descr=quasifielddescr)
+        escape(i1)
         jump(p1, p0, i1)
         """
         self.optimize_loop(ops, expected)
@@ -5739,11 +5741,13 @@
         quasiimmut_field(ConstPtr(myptr), descr=quasiimmutdescr)
         guard_not_invalidated() []
         i1 = getfield_gc(ConstPtr(myptr), descr=quasifielddescr)
+        escape(i1)
         jump()
         """
         expected = """
         []
         guard_not_invalidated() []        
+        escape(-4247)
         jump()
         """
         self.optimize_loop(ops, expected, expected)
@@ -5778,32 +5782,3 @@
         jump(i0)
         """
         self.optimize_loop(ops, expected)
-
-##class TestOOtype(OptimizeOptTest, OOtypeMixin):
-
-##    def test_instanceof(self):
-##        ops = """
-##        [i0]
-##        p0 = new_with_vtable(ConstClass(node_vtable))
-##        i1 = instanceof(p0, descr=nodesize)
-##        jump(i1)
-##        """
-##        expected = """
-##        [i0]
-##        jump(1)
-##        """
-##        self.optimize_loop(ops, expected)
-
-##    def test_instanceof_guard_class(self):
-##        ops = """
-##        [i0, p0]
-##        guard_class(p0, ConstClass(node_vtable)) []
-##        i1 = instanceof(p0, descr=nodesize)
-##        jump(i1, p0)
-##        """
-##        expected = """
-##        [i0, p0]
-##        guard_class(p0, ConstClass(node_vtable)) []
-##        jump(1, p0)
-##        """
-##        self.optimize_loop(ops, expected)

diff --git a/pypy/jit/metainterp/test/test_optimizeutil.py b/pypy/jit/metainterp/test/test_optimizeutil.py
--- a/pypy/jit/metainterp/test/test_optimizeutil.py
+++ b/pypy/jit/metainterp/test/test_optimizeutil.py
@@ -70,6 +70,7 @@
                             ('mutate_field', rclass.OBJECTPTR),
                             hints={'immutable_fields': accessor})
     quasi = lltype.malloc(QUASI, immortal=True)
+    quasi.inst_field = -4247
     quasifielddescr = cpu.fielddescrof(QUASI, 'inst_field')
     quasibox = BoxPtr(lltype.cast_opaque_ptr(llmemory.GCREF, quasi))
     quasiimmutdescr = QuasiImmutDescr(cpu, quasibox,