[pypy-svn] r75415 - in pypy/release/1.3.x: . pypy/jit/codewriter pypy/jit/codewriter/test

[fijal at codespeak.net]

Author: fijal
Date: Wed Jun 16 01:17:46 2010
New Revision: 75415

Modified:
   pypy/release/1.3.x/   (props changed)
   pypy/release/1.3.x/pypy/jit/codewriter/flatten.py
   pypy/release/1.3.x/pypy/jit/codewriter/test/test_flatten.py
Log:
Merge 75414 from trunk, should fix 64bit tests


Modified: pypy/release/1.3.x/pypy/jit/codewriter/flatten.py
==============================================================================
--- pypy/release/1.3.x/pypy/jit/codewriter/flatten.py	(original)
+++ pypy/release/1.3.x/pypy/jit/codewriter/flatten.py	Wed Jun 16 01:17:46 2010
@@ -325,9 +325,12 @@
         # Write 'last_exc_xxx' operations that load the last exception
         # directly into the locations specified by 'inputargs'.  This
         # must be done at the end of the link renamings.
+        if link.last_exception is link.last_exc_value is None:
+            return
         for v, w in zip(link.args, inputargs):
             if v is link.last_exception:
                 self.emitline("last_exception", "->", self.getcolor(w))
+        for v, w in zip(link.args, inputargs):
             if v is link.last_exc_value:
                 self.emitline("last_exc_value", "->", self.getcolor(w))
 

Modified: pypy/release/1.3.x/pypy/jit/codewriter/test/test_flatten.py
==============================================================================
--- pypy/release/1.3.x/pypy/jit/codewriter/test/test_flatten.py	(original)
+++ pypy/release/1.3.x/pypy/jit/codewriter/test/test_flatten.py	Wed Jun 16 01:17:46 2010
@@ -430,8 +430,8 @@
         void_return
         ---
         L1:
-        last_exc_value -> %r0
         last_exception -> %i1
+        last_exc_value -> %r0
         setfield_gc_i $<* struct test.Foo>, <Descr>, $5
         -live-
         raise %r0