Author: Maciej Fijalkowski <[email protected]>
Branch: optresult-unroll
Changeset: r79263:07045431ecaa
Date: 2015-08-27 19:26 +0200
http://bitbucket.org/pypy/pypy/changeset/07045431ecaa/
Log: rpythonize
diff --git a/rpython/jit/metainterp/optimizeopt/info.py
b/rpython/jit/metainterp/optimizeopt/info.py
--- a/rpython/jit/metainterp/optimizeopt/info.py
+++ b/rpython/jit/metainterp/optimizeopt/info.py
@@ -462,7 +462,7 @@
optforce.emit_operation(setop)
optforce.pure_from_args(rop.ARRAYLEN_GC, [op],
ConstInt(len(self._items)))
- def setitem(self, descr, index, struct_op, op, cf=None, optheap=None):
+ def setitem(self, descr, index, struct, op, cf=None, optheap=None):
if self._items is None:
self._items = [None] * (index + 1)
if index >= len(self._items):
@@ -470,7 +470,7 @@
self._items[index] = op
if cf is not None:
assert not self.is_virtual()
- cf.register_dirty_field(struct_op, self)
+ cf.register_dirty_field(struct, self)
def getitem(self, descr, index, optheap=None):
if self._items is None or index >= len(self._items):
diff --git a/rpython/jit/metainterp/optimizeopt/intutils.py
b/rpython/jit/metainterp/optimizeopt/intutils.py
--- a/rpython/jit/metainterp/optimizeopt/intutils.py
+++ b/rpython/jit/metainterp/optimizeopt/intutils.py
@@ -227,6 +227,7 @@
return True
def contains_bound(self, other):
+ assert isinstance(other, IntBound)
if other.has_lower:
if not self.contains(other.lower):
return False
diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py
b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -266,6 +266,7 @@
if op.is_guard():
op = self.replace_op_with(op, op.getopnum(),
descr=compile.ResumeAtPositionDescr())
+ assert isinstance(op, GuardResOp)
op.rd_snapshot = patchguardop.rd_snapshot
op.rd_frame_info_list = patchguardop.rd_frame_info_list
self.optimizer.send_extra_operation(op)
diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py
b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -105,7 +105,7 @@
'Generating guards for making the VirtualStates ' +
'at hand match have not been implemented')
- def enum_forced_boxes(self, boxes, structbox, optimizer,
force_boxes=False):
+ def enum_forced_boxes(self, boxes, box, optimizer, force_boxes=False):
raise NotImplementedError
def enum(self, virtual_state):
@@ -148,6 +148,7 @@
opinfo = state.optimizer.getptrinfo(box)
if runtime_box is not None:
assert opinfo.is_virtual()
+ assert isinstance(opinfo, AbstractStructPtrInfo)
if len(self.fielddescrs) != len(other.fielddescrs):
raise VirtualStatesCantMatch("field descrs don't match")
@@ -293,6 +294,7 @@
fieldbox = None
fieldbox_runtime = None
opinfo = state.optimizer.getptrinfo(box)
+ assert isinstance(opinfo, ArrayPtrInfo)
for i in range(self.length):
for descr in self.fielddescrs:
index = i * len(self.fielddescrs) + descr.get_index()
@@ -311,8 +313,8 @@
if s is not None:
s.enum(virtual_state)
- def enum_forced_boxes(self, boxes, structbox, optimizer,
force_boxes=False):
- opinfo = optimizer.getptrinfo(structbox)
+ def enum_forced_boxes(self, boxes, box, optimizer, force_boxes=False):
+ opinfo = optimizer.getptrinfo(box)
if not isinstance(opinfo, ArrayStructInfo):
raise BadVirtualState
if not opinfo.is_virtual():
@@ -360,7 +362,6 @@
self.level = LEVEL_KNOWNCLASS
elif info.is_nonnull():
self.level = LEVEL_NONNULL
- # XXX strings?
self.lenbound = info.getlenbound(None)
elif type == 'i':
if isinstance(info, IntBound):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
