[pypy-svn] r74905 - in pypy/branch/blackhole-improvement/pypy/jit/backend: llsupport x86/test

[arigo at codespeak.net]

Author: arigo
Date: Sun May 30 12:31:07 2010
New Revision: 74905

Modified:
   pypy/branch/blackhole-improvement/pypy/jit/backend/llsupport/llmodel.py
   pypy/branch/blackhole-improvement/pypy/jit/backend/x86/test/test_gc_integration.py
Log:
Fix test.


Modified: pypy/branch/blackhole-improvement/pypy/jit/backend/llsupport/llmodel.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/backend/llsupport/llmodel.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/backend/llsupport/llmodel.py	Sun May 30 12:31:07 2010
@@ -60,9 +60,6 @@
     def setup(self):
         pass
 
-    def set_class_sizes(self, class_sizes):
-        self.class_sizes = class_sizes
-
     def _setup_prebuilt_error(self, prefix, Class):
         if self.rtyper is not None:   # normal case
             bk = self.rtyper.annotator.bookkeeper

Modified: pypy/branch/blackhole-improvement/pypy/jit/backend/x86/test/test_gc_integration.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/backend/x86/test/test_gc_integration.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/backend/x86/test/test_gc_integration.py	Sun May 30 12:31:07 2010
@@ -6,6 +6,7 @@
 from pypy.jit.metainterp.history import ResOperation, BoxInt, ConstInt,\
      BoxPtr, ConstPtr, TreeLoop
 from pypy.jit.metainterp.resoperation import rop, ResOperation
+from pypy.jit.codewriter import heaptracker
 from pypy.jit.backend.llsupport.descr import GcCache
 from pypy.jit.backend.llsupport.gc import GcLLDescription
 from pypy.jit.backend.x86.runner import CPU
@@ -228,7 +229,7 @@
         NODE2 = lltype.Struct('node2', ('tid', lltype.Signed),
                                   ('vtable', lltype.Ptr(rclass.OBJECT_VTABLE)))
         descrsize = cpu.sizeof(NODE2)
-        cpu.set_class_sizes({vtable_int: descrsize})
+        heaptracker.register_known_gctype(cpu, vtable, NODE2)
         self.descrsize = descrsize
         self.vtable_int = vtable_int