[pypy-svn] r51986 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sat Mar  1 12:54:37 2008
New Revision: 51986

Modified:
   pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py
   pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py
Log:
add an assert that the merge point is in the portal


Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py
==============================================================================
--- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py	(original)
+++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py	Sat Mar  1 12:54:37 2008
@@ -223,6 +223,7 @@
             cand = 0
             if (op.opname == 'hint' and
                 op.args[1].value == {'global_merge_point': True}):
+                assert not self.is_portal, "global_merge_point can appare only in portal"
                 hashint = True
                 if block is startblock or len(entrymap[block]) > 1:
                     global_merge_blocks[block] = True

Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py
==============================================================================
--- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py	(original)
+++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py	Sat Mar  1 12:54:37 2008
@@ -1639,11 +1639,6 @@
         py.test.skip("not working yet")
 
         class MetaG:
-            __metaclass__ = cachedtype
-
-            def __init__(self, hrtyper):
-                pass
-
             def _freeze_(self):
                 return True
 
@@ -1699,7 +1694,6 @@
         assert res == f(0)
 
     def test_misplaced_global_merge_point(self):
-        py.test.skip("not working yet")
         def g(n):
             hint(None, global_merge_point=True)
             return n+1