[pypy-svn] r74913 - in pypy/branch/blackhole-improvement/pypy/jit: backend/x86/test codewriter

[arigo at codespeak.net]

Author: arigo
Date: Sun May 30 14:16:09 2010
New Revision: 74913

Modified:
   pypy/branch/blackhole-improvement/pypy/jit/backend/x86/test/test_ztranslation.py
   pypy/branch/blackhole-improvement/pypy/jit/codewriter/heaptracker.py
Log:
Fixes.


Modified: pypy/branch/blackhole-improvement/pypy/jit/backend/x86/test/test_ztranslation.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/backend/x86/test/test_ztranslation.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/backend/x86/test/test_ztranslation.py	Sun May 30 14:16:09 2010
@@ -5,7 +5,7 @@
 from pypy.jit.metainterp.jitprof import Profiler
 from pypy.jit.backend.x86.runner import CPU386
 from pypy.jit.backend.test.support import CCompiledMixin
-from pypy.jit.metainterp.policy import StopAtXPolicy
+from pypy.jit.codewriter.policy import StopAtXPolicy
 from pypy.translator.translator import TranslationContext
 
 class TestTranslationX86(CCompiledMixin):

Modified: pypy/branch/blackhole-improvement/pypy/jit/codewriter/heaptracker.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/codewriter/heaptracker.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/codewriter/heaptracker.py	Sun May 30 14:16:09 2010
@@ -62,7 +62,7 @@
 def finish_registering(cpu):
     # annotation hack for small examples which have no vtable at all
     if not hasattr(cpu, '_all_size_descrs_with_vtable'):
-        STRUCT = lltype.GcStruct('empty')
+        STRUCT = lltype.GcStruct('empty', ('parent', rclass.OBJECT))
         vtable = lltype.malloc(rclass.OBJECT_VTABLE, immortal=True)
         register_known_gctype(cpu, vtable, STRUCT)