Author: David Schneider <david.schnei...@picle.org> Branch: Changeset: r65170:4eeb5629fb68 Date: 2013-07-03 16:52 +0200 http://bitbucket.org/pypy/pypy/changeset/4eeb5629fb68/
Log: kill the include_debug_merge_points option and ignore debug_merge_points always 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,18 @@ 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): for op in chunk.operations: - if op.name != 'debug_merge_point' or include_debug_merge_points: + if op.name != 'debug_merge_point': yield op - def _allops(self, include_debug_merge_points=False, opcode=None): + def _allops(self, opcode=None): 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): yield op else: for op in chunk.operations: @@ -162,15 +162,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, 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): if op in loop_ops: yield op _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit