[pypy-commit] pypy gc_no_cleanup_nursery: wrong descr

fijal noreply at buildbot.pypy.org
Thu Sep 25 09:54:39 CEST 2014


Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: gc_no_cleanup_nursery
Changeset: r73685:8c86202d41ef
Date: 2014-09-25 09:52 +0200
http://bitbucket.org/pypy/pypy/changeset/8c86202d41ef/

Log:	wrong descr

diff --git a/rpython/jit/backend/llgraph/runner.py b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -228,18 +228,20 @@
                 'i': 0,
                 'f': 0.0}
 
-def fielddescrs_for(cpu, STRUCT, res=None):
+def fielddescrs_for(cpu, A, res=None):
     if res is None:
         res = []
+    STRUCT = A.OF
     # order is not relevant, except for tests
     for name in STRUCT._names:
         FIELD = getattr(STRUCT, name)
         if FIELD is lltype.Void:
             continue
         elif isinstance(FIELD, lltype.Struct):
-            fielddescrs_for(cpu, FIELD, res)
+            assert False
+            #fielddescrs_for(cpu, FIELD, res)
         else:
-            res.append(cpu.fielddescrof(STRUCT, name))
+            res.append(cpu.interiorfielddescrof(A, name))
     return res
 
 
@@ -411,7 +413,7 @@
             descr = ArrayDescr(A)
             self.descrs[key] = descr
             if descr.is_array_of_structs():
-                descr.fielddescrs = fielddescrs_for(self, A.OF)
+                descr.fielddescrs = fielddescrs_for(self, A)
             return descr
 
     def interiorfielddescrof(self, A, fieldname):


More information about the pypy-commit mailing list