[pypy-svn] r66068 - pypy/branch/pyjitpl5/pypy/translator/c

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:39:30 2009
New Revision: 66068

Added:
   pypy/branch/pyjitpl5/pypy/translator/c/funcgen.py.merge.tmp
      - copied, changed from r66039, pypy/branch/pyjitpl5/pypy/translator/c/funcgen.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/translator/c/funcgen.py
revisions 62865 to 66039:

    ------------------------------------------------------------------------
    r65525 | pedronis | 2009-06-01 08:22:12 +0200 (Mon, 01 Jun 2009) | 5 lines
    
    reverting 65522, it broke a couple tests in applevel and lib-python tests
    
    not completely clear why, in general our error code is not that well tested by our own tests
    
    
    ------------------------------------------------------------------------
    r65522 | benjamin | 2009-06-01 02:00:54 +0200 (Mon, 01 Jun 2009) | 1 line
    
    normalize raise statements
    ------------------------------------------------------------------------
    r64323 | benjamin | 2009-04-18 04:44:10 +0200 (Sat, 18 Apr 2009) | 1 line
    
    remove from __future__ import generators
    ------------------------------------------------------------------------
    r62931 | arigo | 2009-03-13 13:12:41 +0100 (Fri, 13 Mar 2009) | 7 lines
    
    Port r60900 and r61877 from the oo-jit branch:
        
        Fix debug_print of strings, broken now that the RPython strings
        are no longer zero-terminated.  Requires copying the RPython
        strings into a non-movable, zero-terminated buffer.
    
    
    ------------------------------------------------------------------------
    r62886 | cfbolz | 2009-03-12 14:55:25 +0100 (Thu, 12 Mar 2009) | 2 lines
    
    kill some very old code that seems dead nowadays
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/translator/c/funcgen.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/translator/c/funcgen.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/translator/c/funcgen.py	(original)
+++ pypy/branch/pyjitpl5/pypy/translator/c/funcgen.py.merge.tmp	Tue Jun 30 16:39:30 2009
@@ -1,4 +1,3 @@
-from __future__ import generators
 from pypy.translator.c.support import USESLOTS # set to False if necessary while refactoring
 from pypy.translator.c.support import cdecl
 from pypy.translator.c.support import llvalue_from_constant, gen_assignments
@@ -294,19 +293,15 @@
                     raise TypeError("exitswitch type not supported"
                                     "  Got %r" % (TYPE,))
 
-    def gen_link(self, link, linklocalvars=None):
+    def gen_link(self, link):
         "Generate the code to jump across the given Link."
         is_alive = {}
-        linklocalvars = linklocalvars or {}
         assignments = []
         for a1, a2 in zip(link.args, link.target.inputargs):
             a2type, a2typename = self.lltypes[id(a2)]
             if a2type is Void:
                 continue
-            if a1 in linklocalvars:
-                src = linklocalvars[a1]
-            else:
-                src = self.expr(a1)
+            src = self.expr(a1)
             dest = LOCALVAR % a2.name
             assignments.append((a2typename, dest, src))
         for line in gen_assignments(assignments):