Author: David Schneider <david.schnei...@picle.org>
Branch: arm-backend-2
Changeset: r45609:ed3eaad9f4fe
Date: 2011-07-15 10:34 +0200
http://bitbucket.org/pypy/pypy/changeset/ed3eaad9f4fe/
Log: fix test_gc_integration
diff --git a/pypy/jit/backend/arm/assembler.py
b/pypy/jit/backend/arm/assembler.py
--- a/pypy/jit/backend/arm/assembler.py
+++ b/pypy/jit/backend/arm/assembler.py
@@ -117,7 +117,7 @@
ll_new_unicode)
if gc_ll_descr.get_malloc_slowpath_addr is not None:
self._build_malloc_slowpath()
- if gc_ll_descr.gcrootmap:
+ if gc_ll_descr.gcrootmap and gc_ll_descr.is_shadow_stack:
self._build_release_gil(gc_ll_descr.gcrootmap)
self.memcpy_addr = self.cpu.cast_ptr_to_int(memcpy_fn)
self._exit_code_addr = self._gen_exit_path()
diff --git a/pypy/jit/backend/arm/test/test_gc_integration.py
b/pypy/jit/backend/arm/test/test_gc_integration.py
--- a/pypy/jit/backend/arm/test/test_gc_integration.py
+++ b/pypy/jit/backend/arm/test/test_gc_integration.py
@@ -16,7 +16,7 @@
from pypy.rpython.lltypesystem import lltype, llmemory, rffi
from pypy.rpython.annlowlevel import llhelper
from pypy.rpython.lltypesystem import rclass, rstr
-from pypy.jit.backend.llsupport.gc import GcLLDescr_framework, GcRefList,
GcPtrFieldDescr
+from pypy.jit.backend.llsupport.gc import GcLLDescr_framework, GcPtrFieldDescr
from pypy.jit.backend.arm.test.test_regalloc import MockAssembler
from pypy.jit.backend.arm.test.test_regalloc import BaseTestRegalloc
@@ -54,6 +54,7 @@
return ['compressed'] + shape[1:]
class MockGcDescr(GcCache):
+ is_shadow_stack = False
def get_funcptr_for_new(self):
return 123
get_funcptr_for_newarray = get_funcptr_for_new
@@ -65,11 +66,9 @@
gcrootmap = MockGcRootMap()
def initialize(self):
- self.gcrefs = GcRefList()
- self.gcrefs.initialize()
- self.single_gcref_descr = GcPtrFieldDescr('', 0)
-
- replace_constptrs_with_getfield_raw =
GcLLDescr_framework.replace_constptrs_with_getfield_raw.im_func
+ pass
+
+ record_constptrs = GcLLDescr_framework.record_constptrs.im_func
rewrite_assembler = GcLLDescr_framework.rewrite_assembler.im_func
class TestRegallocDirectGcIntegration(object):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
