[pypy-commit] pypy inline-dict-ops: Revert d0bcf756f012, which breaks test_ztranslation. Will fix

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: inline-dict-ops
Changeset: r48321:0c7d048ff30c
Date: 2011-10-21 23:12 +0200
http://bitbucket.org/pypy/pypy/changeset/0c7d048ff30c/

Log:	Revert d0bcf756f012, which breaks test_ztranslation. Will fix
	test_zrpy_gc in a way that is more consistent with the existing
	workarounds.

diff --git a/pypy/jit/codewriter/assembler.py b/pypy/jit/codewriter/assembler.py
--- a/pypy/jit/codewriter/assembler.py
+++ b/pypy/jit/codewriter/assembler.py
@@ -246,13 +246,9 @@
             addr = llmemory.cast_ptr_to_adr(value)
             self.list_of_addr2name.append((addr, name))
 
-    def finished(self, callinfocollection, cpu):
+    def finished(self, callinfocollection):
         # Helper called at the end of assembling.  Registers the extra
         # functions shown in _callinfo_for_oopspec.
         for func in callinfocollection.all_function_addresses_as_int():
             func = heaptracker.int2adr(func)
             self.see_raw_object(func.ptr)
-        # register at least one interiorfielddescr
-        if hasattr(cpu, 'interiorfielddescrof'):
-            _T = lltype.GcArray(lltype.Struct('x', ('field', lltype.Signed)))
-            self.descrs.append(cpu.interiorfielddescrof(_T, 'field'))
diff --git a/pypy/jit/codewriter/codewriter.py b/pypy/jit/codewriter/codewriter.py
--- a/pypy/jit/codewriter/codewriter.py
+++ b/pypy/jit/codewriter/codewriter.py
@@ -73,7 +73,7 @@
             count += 1
             if not count % 500:
                 log.info("Produced %d jitcodes" % count)
-        self.assembler.finished(self.callcontrol.callinfocollection, self.cpu)
+        self.assembler.finished(self.callcontrol.callinfocollection)
         heaptracker.finish_registering(self.cpu)
         log.info("there are %d JitCode instances." % count)