Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: optresult
Changeset: r77773:3b5889478fc5
Date: 2015-06-02 16:35 +0200
http://bitbucket.org/pypy/pypy/changeset/3b5889478fc5/
Log: two more small fixes
diff --git a/rpython/jit/metainterp/pyjitpl.py
b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -2774,7 +2774,7 @@
self.generate_guard(rop.GUARD_NO_OVERFLOW, None)
def assert_no_exception(self):
- assert self.last_exc_value
+ assert not self.last_exc_value
def rebuild_state_after_failure(self, resumedescr, deadframe):
vinfo = self.jitdriver_sd.virtualizable_info
diff --git a/rpython/jit/metainterp/resume.py b/rpython/jit/metainterp/resume.py
--- a/rpython/jit/metainterp/resume.py
+++ b/rpython/jit/metainterp/resume.py
@@ -1055,7 +1055,7 @@
str1box = self.decode_box(str1num, REF)
str2box = self.decode_box(str2num, REF)
return self.metainterp.execute_and_record_varargs(
- rop.CALL, [ConstInt(func), str1box, str2box], calldescr)
+ rop.CALL_R, [ConstInt(func), str1box, str2box], calldescr)
def slice_string(self, strnum, startnum, lengthnum):
cic = self.metainterp.staticdata.callinfocollection
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
