[pypy-svn] r24842 - pypy/branch/explicit-exceptions/rpython/memory

mwh at codespeak.net mwh at codespeak.net
Thu Mar 23 01:00:21 CET 2006


Author: mwh
Date: Thu Mar 23 01:00:09 2006
New Revision: 24842

Modified:
   pypy/branch/explicit-exceptions/rpython/memory/gctransform.py
Log:
more cleanup related cruft dies.


Modified: pypy/branch/explicit-exceptions/rpython/memory/gctransform.py
==============================================================================
--- pypy/branch/explicit-exceptions/rpython/memory/gctransform.py	(original)
+++ pypy/branch/explicit-exceptions/rpython/memory/gctransform.py	Thu Mar 23 01:00:09 2006
@@ -437,10 +437,6 @@
         g, fptr = self.annotate_helper(this, [llmemory.Address], lltype.Void)
         # the produced deallocator graph does not need to be transformed
         self.seen_graphs[g] = True
-        if destrptr:
-            # however, the direct_call to the destructor needs to get
-            # .cleanup attached
-            self.deallocator_graphs_needing_transforming.append(g)
 
         self.static_deallocator_funcptrs[TYPE] = fptr
         for p in find_gc_ptrs_in_type(TYPE):
@@ -784,20 +780,17 @@
             [s_gcdata] + [annmodel.SomeInteger(nonneg=True) for i in range(5)],
             annmodel.SomeAddress())
         annhelper.finish()   # at this point, annotate all mix-level helpers
-        self.frameworkgc_setup_ptr = self.graph2funcptr(frameworkgc_setup_graph,
-                                                        attach_empty_cleanup=True)
+        self.frameworkgc_setup_ptr = self.graph2funcptr(frameworkgc_setup_graph)
         self.push_root_ptr = self.graph2funcptr(push_root_graph)
         self.graphs_to_inline[push_root_graph] = True
         self.pop_root_ptr = self.graph2funcptr(pop_root_graph)
         self.graphs_to_inline[pop_root_graph] = True
-        self.malloc_fixedsize_ptr = self.graph2funcptr(malloc_fixedsize_graph, True)
-        self.malloc_varsize_ptr = self.graph2funcptr(malloc_varsize_graph, True)
+        self.malloc_fixedsize_ptr = self.graph2funcptr(malloc_fixedsize_graph)
+        self.malloc_varsize_ptr = self.graph2funcptr(malloc_varsize_graph)
         self.graphs_to_inline[malloc_fixedsize_graph] = True
 
-    def graph2funcptr(self, graph, attach_empty_cleanup=False):
+    def graph2funcptr(self, graph):
         self.seen_graphs[graph] = True
-        #if attach_empty_cleanup:
-        #    MinimalGCTransformer(self.translator).transform_graph(graph)
         return const_funcptr_fromgraph(graph)
 
     def get_type_id(self, TYPE):



More information about the Pypy-commit mailing list