[pypy-commit] pypy default: merge heads

[gutworth]

Author: Benjamin Peterson <benjamin at python.org>
Branch: 
Changeset: r45594:ec0511be1922
Date: 2011-07-14 08:39 -0500
http://bitbucket.org/pypy/pypy/changeset/ec0511be1922/

Log:	merge heads

diff --git a/pypy/jit/codewriter/regalloc.py b/pypy/jit/codewriter/regalloc.py
--- a/pypy/jit/codewriter/regalloc.py
+++ b/pypy/jit/codewriter/regalloc.py
@@ -96,6 +96,7 @@
 
     def _try_coalesce(self, v, w):
         if isinstance(v, Variable) and getkind(v.concretetype) == self.kind:
+            assert getkind(w.concretetype) == self.kind
             dg = self._depgraph
             uf = self._unionfind
             v0 = uf.find_rep(v)