[pypy-svn] r66577 - in pypy/branch/pyjitpl5-optimize4/pypy/jit: backend/llgraph metainterp

[arigo at codespeak.net]

Author: arigo
Date: Fri Jul 24 14:36:05 2009
New Revision: 66577

Modified:
   pypy/branch/pyjitpl5-optimize4/pypy/jit/backend/llgraph/llimpl.py
   pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/pyjitpl.py
Log:
Minor fixes and assert improvements.


Modified: pypy/branch/pyjitpl5-optimize4/pypy/jit/backend/llgraph/llimpl.py
==============================================================================
--- pypy/branch/pyjitpl5-optimize4/pypy/jit/backend/llgraph/llimpl.py	(original)
+++ pypy/branch/pyjitpl5-optimize4/pypy/jit/backend/llgraph/llimpl.py	Fri Jul 24 14:36:05 2009
@@ -822,6 +822,8 @@
     frame.loop = loop
     frame.env = {}
     for i in range(len(loop.inputargs)):
+        expected_type = loop.inputargs[i].concretetype
+        assert lltype.typeOf(_future_values[i]) == expected_type
         frame.env[loop.inputargs[i]] = _future_values[i]
     del _future_values[:]
 

Modified: pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/pyjitpl.py
==============================================================================
--- pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/pyjitpl.py	(original)
+++ pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/pyjitpl.py	Fri Jul 24 14:36:05 2009
@@ -1151,7 +1151,7 @@
         if not canfold:
             op = self.history.record(opnum, argboxes, resbox, descr)
             if (not we_are_translated() and op is not None
-                and self.framestack):
+                and getattr(self, 'framestack', None)):
                 op.pc = self.framestack[-1].pc
                 op.name = self.framestack[-1].jitcode.name
         if require_attention: