[pypy-svn] r64432 - pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp

[fijal at codespeak.net]

Author: fijal
Date: Mon Apr 20 05:03:38 2009
New Revision: 64432

Modified:
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/pyjitpl.py
Log:
deepen paranoia about restoring env.


Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/pyjitpl.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/pyjitpl.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/pyjitpl.py	Mon Apr 20 05:03:38 2009
@@ -951,14 +951,16 @@
         assert len(pseudoframe._saved_framestack) == len(self.framestack)
         for j in range(len(self.framestack)):
             f = self.framestack[j]
-            assert len(f.env) == len(pseudoframe._saved_framestack[j])
+            pseudoenv = pseudoframe._saved_framestack[j]
+            assert len(f.env) == len(pseudoenv)
             for k in range(len(f.env)):
                 box = f.env[k]
-                pseudoenv = pseudoframe._saved_framestack[j]
                 if isinstance(box, BoxInt):
+                    assert isinstance(pseudoenv[k], BoxInt)
                     box.changevalue_int(saved_env[i].getint())
                     i += 1
                 elif isinstance(box, BoxPtr):
+                    assert isinstance(pseudoenv[k], BoxPtr)
                     box.changevalue_ptr(saved_env[i].getptr_base())
                     i += 1
                 else: