[pypy-commit] pypy default: these should result in InvalidLoops

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: 
Changeset: r54792:3206e05abe93
Date: 2012-04-28 15:33 +0200
http://bitbucket.org/pypy/pypy/changeset/3206e05abe93/

Log:	these should result in InvalidLoops

diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -5090,26 +5090,6 @@
 class TestLLtype(BaseTestOptimizeBasic, LLtypeMixin):
     pass
 
-    def test_issue1080_basic(self):
-        ops = """
-        []
-        p69 = same_as(ConstPtr(myptr))
-        quasiimmut_field(p69, descr=quasiimmutdescr)
-        guard_not_invalidated() []
-        p71 = getfield_gc(p69, descr=quasifielddescr) # inst_code
-        guard_value(p71, -4247) []
-        jump()
-        """
-        expected = """
-        []
-        p72 = getfield_gc(ConstPtr(myptr), descr=quasifielddescr)
-        guard_value(p72, -4247) []
-        jump()
-        """
-        self.optimize_loop(ops, expected)
-
-
-
 ##class TestOOtype(BaseTestOptimizeBasic, OOtypeMixin):
 
 ##    def test_instanceof(self):
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
@@ -7833,13 +7833,9 @@
         setfield_gc(p106, p108, descr=nextdescr) # inst_storage
         jump(p106)
         """
-        expected = """
-        []
-        p72 = getfield_gc(ConstPtr(myptr2), descr=quasifielddescr)
-        guard_value(p72, -4247) []
-        jump()
-        """
-        self.optimize_loop(ops, expected)
+        py.test.raises(InvalidLoop, self.optimize_loop,
+                       ops, expected)
+        
 
     def test_issue1080_infinitie_loop_simple(self):
         ops = """
@@ -7856,7 +7852,8 @@
         guard_value(p72, -4247) []
         jump()
         """
-        self.optimize_loop(ops, expected)
+        py.test.raises(InvalidLoop, self.optimize_loop,
+                       ops, expected)
 
 class TestLLtype(OptimizeOptTest, LLtypeMixin):
     pass