[pypy-svn] r69992 - in pypy/branch/listcopyop/pypy: rlib rpython/memory/test

[arigo at codespeak.net]

Author: arigo
Date: Tue Dec  8 17:32:51 2009
New Revision: 69992

Modified:
   pypy/branch/listcopyop/pypy/rlib/rgc.py
   pypy/branch/listcopyop/pypy/rpython/memory/test/test_gc.py
Log:
Force the specialization to 'll', mostly for tests
that call this function without a lowlevel or mixlevel
annotator policy.


Modified: pypy/branch/listcopyop/pypy/rlib/rgc.py
==============================================================================
--- pypy/branch/listcopyop/pypy/rlib/rgc.py	(original)
+++ pypy/branch/listcopyop/pypy/rlib/rgc.py	Tue Dec  8 17:32:51 2009
@@ -348,3 +348,4 @@
                     llmemory.sizeof(TP.OF) * dest_start)
     llmemory.raw_memcopy(cp_source_addr, cp_dest_addr,
                          llmemory.sizeof(TP.OF) * length)
+ll_arraycopy._annspecialcase_ = 'specialize:ll'

Modified: pypy/branch/listcopyop/pypy/rpython/memory/test/test_gc.py
==============================================================================
--- pypy/branch/listcopyop/pypy/rpython/memory/test/test_gc.py	(original)
+++ pypy/branch/listcopyop/pypy/rpython/memory/test/test_gc.py	Tue Dec  8 17:32:51 2009
@@ -552,9 +552,6 @@
         assert res == 111
 
     def test_writebarrier_before_copy(self):
-        import new
-        ll_arraycopy = new.function(rgc.ll_arraycopy.func_code, {})
-        
         S = lltype.GcStruct('S')
         TP = lltype.GcArray(lltype.Ptr(S))
         def fn():
@@ -562,7 +559,7 @@
             l2 = lltype.malloc(TP, 100)
             for i in range(100):
                 l[i] = lltype.malloc(S)
-            ll_arraycopy(l, l2, 50, 0, 50)
+            rgc.ll_arraycopy(l, l2, 50, 0, 50)
             x = []
             # force minor collect
             t = (1, lltype.malloc(S))