[pypy-commit] pypy inline-dict-ops: A different fix.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: inline-dict-ops
Changeset: r45911:d6719614d202
Date: 2011-07-23 20:43 +0200
http://bitbucket.org/pypy/pypy/changeset/d6719614d202/

Log:	A different fix.

diff --git a/pypy/jit/codewriter/jtransform.py b/pypy/jit/codewriter/jtransform.py
--- a/pypy/jit/codewriter/jtransform.py
+++ b/pypy/jit/codewriter/jtransform.py
@@ -47,9 +47,11 @@
         newoperations = []
         #
         def do_rename(var, var_or_const):
+            if var.concretetype is lltype.Void:
+                renamings[var] = Constant(None, lltype.Void)
+                return
             renamings[var] = var_or_const
-            if (isinstance(var_or_const, Constant)
-                and var.concretetype != lltype.Void):
+            if isinstance(var_or_const, Constant):
                 value = var_or_const.value
                 value = lltype._cast_whatever(var.concretetype, value)
                 renamings_constants[var] = Constant(value, var.concretetype)