[pypy-svn] r65784 - in pypy/branch/tagged-pointers-framework/pypy: rpython/memory/gctransform translator/c/gcc/test

[arigo at codespeak.net]

Author: arigo
Date: Mon Jun 15 22:02:59 2009
New Revision: 65784

Modified:
   pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gctransform/asmgcroot.py
   pypy/branch/tagged-pointers-framework/pypy/translator/c/gcc/test/test_asmgcroot.py
Log:
Revert r65770.  It turns out that asmgcc is not compatible with non-moving GCs.
It could be fixed but it's not worthwhile (and definitely the "fix" of r65770
was completely broken :-)


Modified: pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gctransform/asmgcroot.py
==============================================================================
--- pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gctransform/asmgcroot.py	(original)
+++ pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gctransform/asmgcroot.py	Mon Jun 15 22:02:59 2009
@@ -31,8 +31,7 @@
             v_adr = gen_cast(hop.llops, llmemory.Address, var)
             v_newaddr = hop.genop("direct_call", [c_asm_gcroot, v_adr],
                                   resulttype=llmemory.Address)
-            if self.gcdata.gc.moving_gc:
-                hop.genop("gc_reload_possibly_moved", [v_newaddr, var])
+            hop.genop("gc_reload_possibly_moved", [v_newaddr, var])
 
     def build_root_walker(self):
         return AsmStackRootWalker(self)

Modified: pypy/branch/tagged-pointers-framework/pypy/translator/c/gcc/test/test_asmgcroot.py
==============================================================================
--- pypy/branch/tagged-pointers-framework/pypy/translator/c/gcc/test/test_asmgcroot.py	(original)
+++ pypy/branch/tagged-pointers-framework/pypy/translator/c/gcc/test/test_asmgcroot.py	Mon Jun 15 22:02:59 2009
@@ -94,13 +94,3 @@
 
     def test_callback_with_collect(self):
         py.test.skip("in-progress")
-
-
-class TestAsmGCRootWithMarkSweep(AbstractTestAsmGCRoot,
-                                 test_newgc.TestUsingFramework):
-    pass
-    # for the individual tests see
-    # ====> ../../test/test_newgc.py
-
-    def test_callback_with_collect(self):
-        py.test.skip("in-progress")