[pypy-svn] pypy out-of-line-guards: fix
fijal
commits-noreply at bitbucket.org
Mon Jan 10 14:10:16 CET 2011
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: out-of-line-guards
Changeset: r40549:fc7974d66a9b
Date: 2011-01-10 13:00 +0200
http://bitbucket.org/pypy/pypy/changeset/fc7974d66a9b/
Log: fix
diff --git a/pypy/jit/codewriter/call.py b/pypy/jit/codewriter/call.py
--- a/pypy/jit/codewriter/call.py
+++ b/pypy/jit/codewriter/call.py
@@ -232,12 +232,12 @@
effectinfo = effectinfo_from_writeanalyze(
readwrite_res, self.cpu, extraeffect, oopspecindex)
#
- res = self.cpu.calldescrof(FUNC, tuple(NON_VOID_ARGS), RESULT,
+ if pure or loopinvariant:
+ assert effectinfo is not None
+ assert effectinfo.extraeffect < EffectInfo.EF_FORCES_VIRTUAL_OR_VIRTUALIZABLE
+
+ return self.cpu.calldescrof(FUNC, tuple(NON_VOID_ARGS), RESULT,
effectinfo)
- if pure or loopinvariant:
- assert res.effectinfo is not None
- assert res.extraeffect < EffectInfo.EF_FORCES_VIRTUAL_OR_VIRTUALIZABLE
- return res
def _canraise(self, op):
if op.opname == 'pseudo_call_cannot_raise':
More information about the Pypy-commit
mailing list