Author: Richard Plangger <[email protected]>
Branch: memoryerror3
Changeset: r79188:e119ce67b48b
Date: 2015-08-24 11:56 +0200
http://bitbucket.org/pypy/pypy/changeset/e119ce67b48b/
Log: translation issues
diff --git a/rpython/jit/metainterp/compile.py
b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -529,7 +529,7 @@
class ResumeGuardDescr(ResumeDescr):
_attrs_ = ('rd_numb', 'rd_count', 'rd_consts', 'rd_virtuals',
'rd_frame_info_list', 'rd_pendingfields', 'rd_accum_list',
- 'status')
+ 'status', 'version')
rd_numb = lltype.nullptr(NUMBERING)
rd_count = 0
@@ -540,6 +540,7 @@
rd_accum_list = None
status = r_uint(0)
+ version = None
def copy_all_attributes_from(self, other):
assert isinstance(other, ResumeGuardDescr)
@@ -744,11 +745,6 @@
class CompileLoopVersionDescr(ResumeGuardDescr):
guard_opnum = rop.GUARD_EARLY_EXIT
- operations = None
- inputargs = None
- faillocs = None
- version = None
-
def handle_fail(self, deadframe, metainterp_sd, jitdriver_sd):
assert 0, "this guard must never fail"
diff --git a/rpython/jit/metainterp/history.py
b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -771,7 +771,7 @@
return self._compiled is not None
def copy_operations(self, operations):
- from rpython.jit.metainterp.compile import ResumeGuardDescr
+ from rpython.jit.metainterp.compile import ResumeGuardDescr,
CompileLoopVersionDescr
ignore = (rop.DEBUG_MERGE_POINT,)
oplist = []
for op in operations:
@@ -787,6 +787,8 @@
cloned.setdescr(descr)
if olddescr.loop_version():
# copy the version
+ assert isinstance(descr, CompileLoopVersionDescr)
+ assert isinstance(olddescr, CompileLoopVersionDescr)
descr.version = olddescr.version
self.faildescrs.append(descr)
return oplist
diff --git a/rpython/jit/metainterp/optimizeopt/guard.py
b/rpython/jit/metainterp/optimizeopt/guard.py
--- a/rpython/jit/metainterp/optimizeopt/guard.py
+++ b/rpython/jit/metainterp/optimizeopt/guard.py
@@ -153,6 +153,8 @@
operations[self.index] = None
descr = self.op.getdescr()
if descr and descr.loop_version():
+ from rpython.jit.metainterp.compile import CompileLoopVersionDescr
+ assert isinstance(descr, CompileLoopVersionDescr)
descr.version = None
if operations[self.index-1] is self.cmp_op:
operations[self.index-1] = None
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
