Author: Antonio Cuni <[email protected]>
Branch: virtual-raw-mallocs
Changeset: r63224:1eba3e30d044
Date: 2013-04-11 10:54 +0100
http://bitbucket.org/pypy/pypy/changeset/1eba3e30d044/
Log: bah, more tests in which we need to convince the annotator to see
the constructor of VRawBufferValue
diff --git a/rpython/jit/backend/x86/test/test_zrpy_gc_boehm.py
b/rpython/jit/backend/x86/test/test_zrpy_gc_boehm.py
--- a/rpython/jit/backend/x86/test/test_zrpy_gc_boehm.py
+++ b/rpython/jit/backend/x86/test/test_zrpy_gc_boehm.py
@@ -2,6 +2,7 @@
import weakref
from rpython.rlib.jit import JitDriver, dont_look_inside
from rpython.jit.backend.x86.test.test_zrpy_gc import run, get_entry, compile
+from rpython.jit.backend.x86.test.test_ztranslation import
fix_annotator_for_vrawbuffer
class X(object):
def __init__(self, x=0):
@@ -31,7 +32,8 @@
g._dont_inline_ = True
return g
-def test_compile_boehm():
+def test_compile_boehm(monkeypatch):
+ fix_annotator_for_vrawbuffer(monkeypatch)
myjitdriver = JitDriver(greens = [], reds = ['n', 'x'])
@dont_look_inside
def see(lst, n):
diff --git a/rpython/jit/backend/x86/test/test_ztranslation_basic.py
b/rpython/jit/backend/x86/test/test_ztranslation_basic.py
--- a/rpython/jit/backend/x86/test/test_ztranslation_basic.py
+++ b/rpython/jit/backend/x86/test/test_ztranslation_basic.py
@@ -12,6 +12,7 @@
from rpython.jit.backend.x86.arch import IS_X86_32, IS_X86_64
from rpython.config.translationoption import DEFL_GC
from rpython.rlib import rgc
+from rpython.jit.backend.x86.test.test_ztranslation import
fix_annotator_for_vrawbuffer
class TestTranslationX86(CCompiledMixin):
CPUClass = getcpuclass()
@@ -22,7 +23,7 @@
assert '-msse2' in cbuilder.eci.compile_extra
assert '-mfpmath=sse' in cbuilder.eci.compile_extra
- def test_stuff_translates(self):
+ def test_stuff_translates(self, monkeypatch):
# this is a basic test that tries to hit a number of features and their
# translation:
# - jitting of loops and bridges
@@ -31,6 +32,7 @@
# - profiler
# - full optimizer
# - floats neg and abs
+ fix_annotator_for_vrawbuffer(monkeypatch)
class Frame(object):
_virtualizable2_ = ['i']
diff --git a/rpython/jit/backend/x86/test/test_ztranslation_call_assembler.py
b/rpython/jit/backend/x86/test/test_ztranslation_call_assembler.py
--- a/rpython/jit/backend/x86/test/test_ztranslation_call_assembler.py
+++ b/rpython/jit/backend/x86/test/test_ztranslation_call_assembler.py
@@ -12,6 +12,7 @@
from rpython.jit.backend.x86.arch import IS_X86_32, IS_X86_64
from rpython.config.translationoption import DEFL_GC
from rpython.rlib import rgc
+from rpython.jit.backend.x86.test.test_ztranslation import
fix_annotator_for_vrawbuffer
class TestTranslationX86(CCompiledMixin):
CPUClass = getcpuclass()
@@ -22,9 +23,10 @@
assert '-msse2' in cbuilder.eci.compile_extra
assert '-mfpmath=sse' in cbuilder.eci.compile_extra
- def test_direct_assembler_call_translates(self):
+ def test_direct_assembler_call_translates(self, monkeypatch):
"""Test CALL_ASSEMBLER and the recursion limit"""
from rpython.rlib.rstackovf import StackOverflow
+ fix_annotator_for_vrawbuffer(monkeypatch)
class Thing(object):
def __init__(self, val):
diff --git
a/rpython/jit/backend/x86/test/test_ztranslation_external_exception.py
b/rpython/jit/backend/x86/test/test_ztranslation_external_exception.py
--- a/rpython/jit/backend/x86/test/test_ztranslation_external_exception.py
+++ b/rpython/jit/backend/x86/test/test_ztranslation_external_exception.py
@@ -12,7 +12,7 @@
from rpython.jit.backend.x86.arch import IS_X86_32, IS_X86_64
from rpython.config.translationoption import DEFL_GC
from rpython.rlib import rgc
-
+from rpython.jit.backend.x86.test.test_ztranslation import
fix_annotator_for_vrawbuffer
class TestTranslationRemoveTypePtrX86(CCompiledMixin):
CPUClass = getcpuclass()
@@ -25,7 +25,9 @@
t.config.translation.gcremovetypeptr = True
return t
- def test_external_exception_handling_translates(self):
+ def test_external_exception_handling_translates(self, monkeypatch):
+ fix_annotator_for_vrawbuffer(monkeypatch)
+
jitdriver = JitDriver(greens = [], reds = ['n', 'total'])
class ImDone(Exception):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
