[pypy-commit] pypy default: merge default
fijal
noreply at buildbot.pypy.org
Sat Mar 23 20:02:10 CET 2013
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch:
Changeset: r62701:8b0ce43d0de4
Date: 2013-03-23 12:01 -0700
http://bitbucket.org/pypy/pypy/changeset/8b0ce43d0de4/
Log: merge default
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1520,9 +1520,9 @@
dummy_lock = DummyLock()
-## Table describing the regular part of the interface of object spaces,
-## namely all methods which only take w_ arguments and return a w_ result
-## (if any). Note: keep in sync with rpython.flowspace.operation.Table.
+# Table describing the regular part of the interface of object spaces,
+# namely all methods which only take w_ arguments and return a w_ result
+# (if any).
ObjSpace.MethodTable = [
# method name # symbol # number of arguments # special method name(s)
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
@@ -180,7 +180,7 @@
if self.boxes_created_this_iteration is not None:
for box in self.inputargs:
- self.boxes_created_this_iteration[box] = True
+ self.boxes_created_this_iteration[box] = None
short_boxes = ShortBoxes(self.optimizer, inputargs,
self.boxes_created_this_iteration)
@@ -241,7 +241,7 @@
for box in self.inputargs:
if box in seen:
continue
- seen[box] = True
+ seen[box] = None
preamble_value = exported_state.exported_values[box]
value = self.optimizer.getvalue(box)
value.import_from(preamble_value, self.optimizer)
@@ -291,7 +291,7 @@
i = 0
while i < len(newoperations):
op = newoperations[i]
- self.boxes_created_this_iteration[op.result] = True
+ self.boxes_created_this_iteration[op.result] = None
args = op.getarglist()
if op.is_guard():
args = args + op.getfailargs()
@@ -363,7 +363,7 @@
else:
op = newoperations[i]
- self.boxes_created_this_iteration[op.result] = True
+ self.boxes_created_this_iteration[op.result] = None
args = op.getarglist()
if op.is_guard():
args = args + op.getfailargs()
@@ -471,7 +471,7 @@
# self.optimizer.loop.logops.repr_of_resop(op))
optimizer.send_extra_operation(op)
- seen[op.result] = True
+ seen[op.result] = None
if op.is_ovf():
guard = ResOperation(rop.GUARD_NO_OVERFLOW, [], None)
optimizer.send_extra_operation(guard)
@@ -498,7 +498,7 @@
value_guards = []
self.short.append(op)
- self.short_seen[op.result] = True
+ self.short_seen[op.result] = None
if emit and self.short_inliner:
newop = self.short_inliner.inline_op(op)
self.optimizer.send_extra_operation(newop)
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
@@ -76,32 +76,32 @@
if self.position in renum:
if renum[self.position] == other.position:
return True
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
renum[self.position] = other.position
if not self._generalization_of(other):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
assert isinstance(other, AbstractVirtualStructStateInfo)
assert len(self.fielddescrs) == len(self.fieldstate)
assert len(other.fielddescrs) == len(other.fieldstate)
if len(self.fielddescrs) != len(other.fielddescrs):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
for i in range(len(self.fielddescrs)):
if other.fielddescrs[i] is not self.fielddescrs[i]:
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
if not self.fieldstate[i].generalization_of(other.fieldstate[i],
renum, bad):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
return True
@@ -167,23 +167,23 @@
if self.position in renum:
if renum[self.position] == other.position:
return True
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
renum[self.position] = other.position
if not self._generalization_of(other):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
if len(self.fieldstate) != len(other.fieldstate):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
for i in range(len(self.fieldstate)):
if not self.fieldstate[i].generalization_of(other.fieldstate[i],
renum, bad):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
return True
@@ -222,36 +222,36 @@
if self.position in renum:
if renum[self.position] == other.position:
return True
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
renum[self.position] = other.position
if not self._generalization_of(other):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
assert isinstance(other, VArrayStructStateInfo)
if len(self.fielddescrs) != len(other.fielddescrs):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
p = 0
for i in range(len(self.fielddescrs)):
if len(self.fielddescrs[i]) != len(other.fielddescrs[i]):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
for j in range(len(self.fielddescrs[i])):
if self.fielddescrs[i][j] is not other.fielddescrs[i][j]:
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
if not self.fieldstate[p].generalization_of(other.fieldstate[p],
renum, bad):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
p += 1
return True
@@ -310,42 +310,42 @@
if self.position in renum:
if renum[self.position] == other.position:
return True
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
renum[self.position] = other.position
if not isinstance(other, NotVirtualStateInfo):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
if other.level < self.level:
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
if self.level == LEVEL_CONSTANT:
if not self.constbox.same_constant(other.constbox):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
elif self.level == LEVEL_KNOWNCLASS:
if not self.known_class.same_constant(other.known_class):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
if not self.intbound.contains_bound(other.intbound):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
if self.lenbound and other.lenbound:
if self.lenbound.mode != other.lenbound.mode or \
self.lenbound.descr != other.lenbound.descr or \
not self.lenbound.bound.contains_bound(other.lenbound.bound):
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
elif self.lenbound:
- bad[self] = True
- bad[other] = True
+ bad[self] = None
+ bad[other] = None
return False
return True
@@ -663,7 +663,7 @@
raise BoxNotProducable
if self.availible_boxes is not None and box not in self.availible_boxes:
raise BoxNotProducable
- self.short_boxes_in_production[box] = True
+ self.short_boxes_in_production[box] = None
if box in self.potential_ops:
ops = self.prioritized_alternatives(box)
More information about the pypy-commit
mailing list