Author: David Schneider <[email protected]>
Branch: release-2.1.x
Changeset: r65172:0dd60277f779
Date: 2013-07-03 17:19 +0200
http://bitbucket.org/pypy/pypy/changeset/0dd60277f779/
Log: merge default
diff --git a/pypy/doc/whatsnew-2.1.rst b/pypy/doc/whatsnew-2.1.rst
--- a/pypy/doc/whatsnew-2.1.rst
+++ b/pypy/doc/whatsnew-2.1.rst
@@ -5,6 +5,9 @@
.. this is a revision shortly after release-2.0
.. startrev: a13c07067613
+.. branch: ndarray-ptp
+put and array.put
+
.. branch: numpy-pickle
Pickling of numpy arrays and dtypes (including record dtypes)
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -5,6 +5,9 @@
.. this is a revision shortly after release-2.0
.. startrev: a13c07067613
+.. branch: ndarray-ptp
+put and array.put
+
.. branch: numpy-pickle
Pickling of numpy arrays and dtypes (including record dtypes)
diff --git a/pypy/module/pypyjit/test_pypy_c/model.py
b/pypy/module/pypyjit/test_pypy_c/model.py
--- a/pypy/module/pypyjit/test_pypy_c/model.py
+++ b/pypy/module/pypyjit/test_pypy_c/model.py
@@ -131,18 +131,19 @@
def has_id(self, id):
return id in self.ids
- def _ops_for_chunk(self, chunk, include_debug_merge_points):
+ def _ops_for_chunk(self, chunk, include_guard_not_invalidated):
for op in chunk.operations:
- if op.name != 'debug_merge_point' or include_debug_merge_points:
+ if op.name != 'debug_merge_point' and \
+ (op.name != 'guard_not_invalidated' or
include_guard_not_invalidated):
yield op
- def _allops(self, include_debug_merge_points=False, opcode=None):
+ def _allops(self, opcode=None, include_guard_not_invalidated=True):
opcode_name = opcode
for chunk in self.flatten_chunks():
opcode = chunk.getopcode()
if opcode_name is None or \
(opcode and opcode.__class__.__name__ == opcode_name):
- for op in self._ops_for_chunk(chunk,
include_debug_merge_points):
+ for op in self._ops_for_chunk(chunk,
include_guard_not_invalidated):
yield op
else:
for op in chunk.operations:
@@ -162,15 +163,15 @@
def print_ops(self, *args, **kwds):
print self.format_ops(*args, **kwds)
- def _ops_by_id(self, id, include_debug_merge_points=False, opcode=None):
+ def _ops_by_id(self, id, include_guard_not_invalidated=True, opcode=None):
opcode_name = opcode
target_opcodes = self.ids[id]
- loop_ops = self.allops(include_debug_merge_points, opcode)
+ loop_ops = self.allops(opcode)
for chunk in self.flatten_chunks():
opcode = chunk.getopcode()
if opcode in target_opcodes and (opcode_name is None or
opcode.__class__.__name__ ==
opcode_name):
- for op in self._ops_for_chunk(chunk,
include_debug_merge_points):
+ for op in self._ops_for_chunk(chunk,
include_guard_not_invalidated):
if op in loop_ops:
yield op
diff --git a/pypy/module/pypyjit/test_pypy_c/test_containers.py
b/pypy/module/pypyjit/test_pypy_c/test_containers.py
--- a/pypy/module/pypyjit/test_pypy_c/test_containers.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_containers.py
@@ -223,5 +223,5 @@
log = self.run(main, [1000])
assert log.result == main(1000)
loop, = log.loops_by_filename(self.filepath)
- ops = loop.ops_by_id('getitem')
+ ops = loop.ops_by_id('getitem', include_guard_not_invalidated=False)
assert log.opnames(ops) == []
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
