diff options
| author |   Armin Rigo <arigo@tunes.org> | 2009-12-01 10:56:34 +0000 |
|---|---|---|
| committer | Armin Rigo <arigo@tunes.org> | 2009-12-01 10:56:34 +0000 |
| commit | 0868c1fc43a4ce9db10f8a95034aa03757e989b5 (patch) | |
| tree | b32334affd3b208ee416e16a1665b39963cfa45c /pypy/jit/metainterp/test/test_resume.py | |
| parent | Add str_w to the TinyObjSpace, to "fix" app-level tests of the locale module (diff) | |
| download | pypy-0868c1fc43a4ce9db10f8a95034aa03757e989b5.tar.gz pypy-0868c1fc43a4ce9db10f8a95034aa03757e989b5.tar.bz2 pypy-0868c1fc43a4ce9db10f8a95034aa03757e989b5.zip | |
Merge the branch/virtual-forcing so far, introducing proper forcing of
virtualizables followed by a guard failure when we eventually return to
assembler. This also changes the front-end so that it always aborts a
trace after the virtualizable was forced.
The changes are not very ootype-friendly. The CLI tests are disabled
for now.
Fix the write analyzer to give the correct answer even when calling
external functions that may call back.
svn merge -r69626:69792 svn+ssh://codespeak.net/svn/pypy/branch/virtual-forcing .
Diffstat (limited to 'pypy/jit/metainterp/test/test_resume.py')
| -rw-r--r-- | pypy/jit/metainterp/test/test_resume.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pypy/jit/metainterp/test/test_resume.py b/pypy/jit/metainterp/test/test_resume.py index 268e715b16..a9d4fc77ce 100644 --- a/pypy/jit/metainterp/test/test_resume.py +++ b/pypy/jit/metainterp/test/test_resume.py @@ -41,6 +41,8 @@ def test_tagged_list_eq(): assert not tagged_list_eq([tag(1, TAGBOX), tag(-2, TAGBOX)], [tag(1, TAGBOX)]) class MyMetaInterp: + _already_allocated_resume_virtuals = None + def __init__(self, cpu=None): if cpu is None: cpu = LLtypeMixin.cpu @@ -124,6 +126,7 @@ def test_prepare_virtuals(): rd_numb = [] rd_consts = [] class FakeMetainterp(object): + _already_allocated_resume_virtuals = None cpu = None reader = ResumeDataReader(FakeStorage(), [], FakeMetainterp()) assert reader.virtuals == ["allocated", None] |