[pypy-svn] r34725 - in pypy/dist/pypy: rpython translator/backendopt

[pedronis at codespeak.net]

Author: pedronis
Date: Sat Nov 18 00:26:32 2006
New Revision: 34725

Modified:
   pypy/dist/pypy/rpython/annlowlevel.py
   pypy/dist/pypy/translator/backendopt/all.py
Log:
make --prof-based-inline and --gc=framework compatible



Modified: pypy/dist/pypy/rpython/annlowlevel.py
==============================================================================
--- pypy/dist/pypy/rpython/annlowlevel.py	(original)
+++ pypy/dist/pypy/rpython/annlowlevel.py	Sat Nov 18 00:26:32 2006
@@ -290,7 +290,7 @@
         translator = self.rtyper.annotator.translator
         newgraphs = translator.graphs[self.original_graph_count:]
         self.original_graph_count = len(translator.graphs)
-        backend_optimizations(translator, newgraphs, **flags)
+        backend_optimizations(translator, newgraphs, secondary=True, **flags)
 
 # ____________________________________________________________
 

Modified: pypy/dist/pypy/translator/backendopt/all.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/all.py	(original)
+++ pypy/dist/pypy/translator/backendopt/all.py	Sat Nov 18 00:26:32 2006
@@ -12,7 +12,7 @@
 from pypy.translator.backendopt.support import log
 from pypy.objspace.flow.model import checkgraph
 
-def backend_optimizations(translator, graphs=None, **kwds):
+def backend_optimizations(translator, graphs=None, secondary=False, **kwds):
     # sensible keywords are
     # raisingop2direct_call, inline_threshold, mallocs
     # merge_if_blocks, constfold, heap2stack
@@ -43,7 +43,7 @@
         print_statistics(translator.graphs[0], translator)
 
     if not config.clever_malloc_removal:
-        if config.profile_based_inline:
+        if config.profile_based_inline and not secondary:
             inline_malloc_removal_phase(config, translator, graphs,
                                         config.inline_threshold*.5) # xxx tune!
             inline.instrument_inline_candidates(graphs, config.inline_threshold)