[pypy-commit] pypy remove-globals-in-jit: Found out the magic incantation that makes ll2ctypes happy.

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: remove-globals-in-jit
Changeset: r59266:53aa7dd2b299
Date: 2012-12-02 15:37 -0800
http://bitbucket.org/pypy/pypy/changeset/53aa7dd2b299/

Log:    Found out the magic incantation that makes ll2ctypes happy.

diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -649,6 +649,7 @@
         return res
 
 class AllVirtuals:
+    llopaque = True
     list = [resume.ResumeDataDirectReader.virtual_default]   # annotation hack
     def __init__(self, list):
         self.list = list
diff --git a/pypy/jit/metainterp/test/test_recursive.py 
b/pypy/jit/metainterp/test/test_recursive.py
--- a/pypy/jit/metainterp/test/test_recursive.py
+++ b/pypy/jit/metainterp/test/test_recursive.py
@@ -849,13 +849,7 @@
         res = self.meta_interp(main, [0], inline=True)
         assert res == main(0)
 
-    def _skip_if_untranslated_on_a_real_backend(self):
-        if not hasattr(self.CPUClass, 'is_llgraph'):
-            py.test.skip("xxx only works on the llgraph backend, or "
-                         "fully translated")
-
     def test_directly_call_assembler_virtualizable_force1(self):
-        self._skip_if_untranslated_on_a_real_backend()
         class Thing(object):
             def __init__(self, val):
                 self.val = val
@@ -950,7 +944,6 @@
         assert res == main(0, 10, 1)
 
     def test_directly_call_assembler_virtualizable_force_blackhole(self):
-        self._skip_if_untranslated_on_a_real_backend()
         class Thing(object):
             def __init__(self, val):
                 self.val = val
diff --git a/pypy/jit/metainterp/test/test_virtualizable.py 
b/pypy/jit/metainterp/test/test_virtualizable.py
--- a/pypy/jit/metainterp/test/test_virtualizable.py
+++ b/pypy/jit/metainterp/test/test_virtualizable.py
@@ -660,13 +660,7 @@
         self.check_aborted_count(3)
         self.check_jitcell_token_count(0)
 
-    def _skip_if_untranslated_on_a_real_backend(self):
-        if not hasattr(self.CPUClass, 'is_llgraph'):
-            py.test.skip("xxx only works on the llgraph backend, or "
-                         "fully translated")
-
     def test_external_read_sometimes(self):
-        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['frame'],
                               virtualizables = ['frame'])
         
@@ -703,7 +697,6 @@
         assert res == f(123)
 
     def test_external_read_sometimes_with_virtuals(self):
-        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['frame'],
                               virtualizables = ['frame'])
         
@@ -747,7 +740,6 @@
         assert res == f(123)
 
     def test_external_read_sometimes_changing_virtuals(self):
-        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['frame'],
                               virtualizables = ['frame'])
         
@@ -796,7 +788,6 @@
         assert res == f(123)
 
     def test_external_read_sometimes_with_exception(self):
-        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['frame'],
                               virtualizables = ['frame'])
         
@@ -839,7 +830,6 @@
         assert res == f(123)
 
     def test_external_read_sometimes_dont_compile_guard(self):
-        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['frame'],
                               virtualizables = ['frame'])
         
@@ -876,7 +866,6 @@
         assert res == f(123)
 
     def test_external_read_sometimes_recursive(self):
-        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['rec', 'frame'],
                               virtualizables = ['frame'])
         
@@ -928,7 +917,6 @@
         assert res == main(123)
 
     def test_external_write_sometimes(self):
-        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['frame'],
                               virtualizables = ['frame'])
         
diff --git a/pypy/jit/metainterp/test/test_virtualref.py 
b/pypy/jit/metainterp/test/test_virtualref.py
--- a/pypy/jit/metainterp/test/test_virtualref.py
+++ b/pypy/jit/metainterp/test/test_virtualref.py
@@ -285,13 +285,7 @@
                           new_array=6)         # next1/2/3
         self.check_aborted_count(0)
 
-    def _skip_if_untranslated_on_a_real_backend(self):
-        if not hasattr(self.CPUClass, 'is_llgraph'):
-            py.test.skip("xxx only works on the llgraph backend, or "
-                         "fully translated")
-
     def test_simple_force_sometimes(self):
-        self._skip_if_untranslated_on_a_real_backend()
         myjitdriver = JitDriver(greens = [], reds = ['n'])
         #
         A = lltype.GcArray(lltype.Signed)
@@ -517,7 +511,6 @@
         self.check_aborted_count(0)
 
     def test_alloc_virtualref_and_then_alloc_structure(self):
-        self._skip_if_untranslated_on_a_real_backend()
         myjitdriver = JitDriver(greens = [], reds = ['n'])
         #
         class XY:
@@ -576,7 +569,6 @@
         py.test.raises(UnknownException, "self.meta_interp(fn, [10])")
 
     def test_call_virtualref_already_forced(self):
-        self._skip_if_untranslated_on_a_real_backend()
         myjitdriver = JitDriver(greens = [], reds = ['n', 'res'])
         #
         class XY:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit