Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c7
Changeset: r75787:95e31f4ec9dd
Date: 2015-02-09 21:15 +0100
http://bitbucket.org/pypy/pypy/changeset/95e31f4ec9dd/
Log: kill an old unused attribute
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
@@ -46,7 +46,6 @@
name = metainterp.staticdata.stats.name_for_new_loop()
loop = TreeLoop(name_prefix + name)
loop.call_pure_results = metainterp.call_pure_results
- loop.stm_info = {}
return loop
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
@@ -630,7 +630,6 @@
inputargs = None
operations = None
call_pure_results = None
- stm_info = None
logops = None
quasi_immutable_deps = None
diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py
b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -390,7 +390,6 @@
self.optearlyforce = None
if loop is not None:
self.call_pure_results = loop.call_pure_results
- self.stm_info = loop.stm_info
self.set_optimizations(optimizations)
self.setup()
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_multilabel.py
b/rpython/jit/metainterp/optimizeopt/test/test_multilabel.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_multilabel.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_multilabel.py
@@ -32,7 +32,6 @@
if op.getopnum()==rop.LABEL]
prv = 0
last_label = []
- stm_info = {}
for nxt in labels + [len(loop.operations)]:
assert prv != nxt
operations = last_label + loop.operations[prv:nxt]
@@ -45,7 +44,7 @@
part.operations = operations
self.add_guard_future_condition(part)
- self._do_optimize_loop(part, None, stm_info)
+ self._do_optimize_loop(part, None)
if part.operations[-1].getopnum() == rop.LABEL:
last_label = [part.operations.pop()]
else:
@@ -497,7 +496,7 @@
class BaseTestOptimizerRenamingBoxes(BaseTestMultiLabel):
- def _do_optimize_loop(self, loop, call_pure_results, stminfo):
+ def _do_optimize_loop(self, loop, call_pure_results):
from rpython.jit.metainterp.optimizeopt.unroll import optimize_unroll
from rpython.jit.metainterp.optimizeopt.util import args_dict
from rpython.jit.metainterp.optimizeopt.pure import OptPure
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -104,7 +104,7 @@
if loop.operations[-1].getopnum() == rop.JUMP:
loop.operations[-1].setdescr(token)
expected = convert_old_style_to_targets(self.parse(optops), jump=True)
- self._do_optimize_loop(loop, call_pure_results, {})
+ self._do_optimize_loop(loop, call_pure_results)
print '\n'.join([str(o) for o in loop.operations])
self.assert_equal(loop, expected)
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_util.py
b/rpython/jit/metainterp/optimizeopt/test/test_util.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_util.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_util.py
@@ -391,14 +391,12 @@
expected.operations, False, remap, text_right,
expect_stm_locations_from_right=True)
- def _do_optimize_loop(self, loop, call_pure_results,
- stm_info):
+ def _do_optimize_loop(self, loop, call_pure_results):
from rpython.jit.metainterp.optimizeopt import optimize_trace
from rpython.jit.metainterp.optimizeopt.util import args_dict
self.loop = loop
loop.call_pure_results = args_dict()
- loop.stm_info = stm_info
if call_pure_results is not None:
for k, v in call_pure_results.items():
loop.call_pure_results[list(k)] = v
@@ -430,8 +428,7 @@
preamble.operations = [ResOperation(rop.LABEL, inputargs, None,
descr=TargetToken(token))] + \
operations + \
[ResOperation(rop.LABEL, jump_args, None,
descr=token)]
- stm_info = {}
- self._do_optimize_loop(preamble, call_pure_results, stm_info)
+ self._do_optimize_loop(preamble, call_pure_results)
assert preamble.operations[-1].getopnum() == rop.LABEL
@@ -445,7 +442,7 @@
assert loop.operations[0].getopnum() == rop.LABEL
loop.inputargs = loop.operations[0].getarglist()
- self._do_optimize_loop(loop, call_pure_results, stm_info)
+ self._do_optimize_loop(loop, call_pure_results)
extra_same_as = []
while loop.operations[0].getopnum() != rop.LABEL:
extra_same_as.append(loop.operations[0])
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
