[pypy-commit] pypy gc_no_cleanup_nursery: passed the backend test

[wenzhuman]

Author: wenzhuman <manwenzhu at gmail.com>
Branch: gc_no_cleanup_nursery
Changeset: r72338:d3b83138e0d7
Date: 2014-07-03 17:03 +0000
http://bitbucket.org/pypy/pypy/changeset/d3b83138e0d7/

Log:	passed the backend test

diff --git a/rpython/jit/backend/llsupport/test/test_gc.py b/rpython/jit/backend/llsupport/test/test_gc.py
--- a/rpython/jit/backend/llsupport/test/test_gc.py
+++ b/rpython/jit/backend/llsupport/test/test_gc.py
@@ -59,7 +59,7 @@
         x += self.gcheaderbuilder.size_gc_header
         return x, tid
 
-    def do_malloc_fixedsize_clear(self, RESTYPE, type_id, size,
+    def do_malloc_fixedsize(self, RESTYPE, type_id, size,
                                   has_finalizer, has_light_finalizer,
                                   contains_weakptr):
         assert not contains_weakptr
@@ -70,7 +70,7 @@
         self.record.append(("fixedsize", repr(size), tid, p))
         return p
 
-    def do_malloc_varsize_clear(self, RESTYPE, type_id, length, size,
+    def do_malloc_varsize(self, RESTYPE, type_id, length, size,
                                 itemsize, offset_to_length):
         p, tid = self._malloc(type_id, size + itemsize * length)
         (p + offset_to_length).signed[0] = length
diff --git a/rpython/memory/gctransform/framework.py b/rpython/memory/gctransform/framework.py
--- a/rpython/memory/gctransform/framework.py
+++ b/rpython/memory/gctransform/framework.py
@@ -279,7 +279,7 @@
         malloc_fixedsize_meth = None
         if GCClass.malloc_zero_filled:
             malloc_fixedsize_clear_meth = GCClass.malloc_fixedsize_clear.im_func
-            self.malloc_fixedsize_clear_ptr = getfn(
+            self.malloc_fixedsize_ptr = getfn(
                 malloc_fixedsize_clear_meth,
                 [s_gc, s_typeid16,
                 annmodel.SomeInteger(nonneg=True),
@@ -287,7 +287,6 @@
                 annmodel.SomeBool(),
                 annmodel.SomeBool()], s_gcref,
                 inline = False)
-            self.malloc_fixedsize_ptr = self.malloc_fixedsize_clear_ptr
             self.malloc_varsize_ptr = getfn(
                     GCClass.malloc_varsize_clear.im_func,
                     [s_gc, s_typeid16]