Author: Manuel Jacob <[email protected]>
Branch:
Changeset: r75741:80ab83e0a2f3
Date: 2015-02-06 20:12 +0100
http://bitbucket.org/pypy/pypy/changeset/80ab83e0a2f3/
Log: Remove unused 'annotator' parameter from functions in
rpython.translator.unsimplify.
diff --git a/rpython/flowspace/generator.py b/rpython/flowspace/generator.py
--- a/rpython/flowspace/generator.py
+++ b/rpython/flowspace/generator.py
@@ -107,7 +107,7 @@
# First, always run simplify_graph in order to reduce the number of
# variables passed around
simplify_graph(graph)
- insert_empty_startblock(None, graph)
+ insert_empty_startblock(graph)
_insert_reads(graph.startblock, Entry.varnames)
Entry.block = graph.startblock
#
@@ -130,7 +130,7 @@
if hlop.opname == 'yield_':
[v_yielded_value] = hlop.args
del block.operations[index]
- newlink = split_block(None, block, index)
+ newlink = split_block(block, index)
newblock = newlink.target
#
class Resume(AbstractPosition):
diff --git a/rpython/jit/codewriter/support.py
b/rpython/jit/codewriter/support.py
--- a/rpython/jit/codewriter/support.py
+++ b/rpython/jit/codewriter/support.py
@@ -107,7 +107,7 @@
"""
# split the block just before the jit_merge_point()
if portalopindex > 0:
- link = split_block(None, portalblock, portalopindex)
+ link = split_block(portalblock, portalopindex)
portalblock = link.target
portalop = portalblock.operations[0]
# split again, this time enforcing the order of the live vars
@@ -115,7 +115,7 @@
assert portalop.opname == 'jit_marker'
assert portalop.args[0].value == 'jit_merge_point'
greens_v, reds_v = decode_hp_hint_args(portalop)
- link = split_block(None, portalblock, 0, greens_v + reds_v)
+ link = split_block(portalblock, 0, greens_v + reds_v)
return link.target
def sort_vars(args_v):
diff --git a/rpython/memory/gctransform/transform.py
b/rpython/memory/gctransform/transform.py
--- a/rpython/memory/gctransform/transform.py
+++ b/rpython/memory/gctransform/transform.py
@@ -221,7 +221,7 @@
# for sanity, we need an empty block at the start of the graph
inserted_empty_startblock = False
if not starts_with_empty_block(graph):
- insert_empty_startblock(self.translator.annotator, graph)
+ insert_empty_startblock(graph)
inserted_empty_startblock = True
is_borrowed = self.compute_borrowed_vars(graph)
@@ -239,7 +239,7 @@
if link.prevblock.exitswitch is None:
link.prevblock.operations.extend(llops)
else:
- insert_empty_block(self.translator.annotator, link, llops)
+ insert_empty_block(link, llops)
# remove the empty block at the start of the graph, which should
# still be empty (but let's check)
diff --git a/rpython/rtyper/rtyper.py b/rpython/rtyper/rtyper.py
--- a/rpython/rtyper/rtyper.py
+++ b/rpython/rtyper/rtyper.py
@@ -371,9 +371,7 @@
assert 0 <= pos < len(newops) - 1
extraops = block.operations[pos+1:]
del block.operations[pos+1:]
- extrablock = insert_empty_block(self.annotator,
- noexclink,
- newops = extraops)
+ extrablock = insert_empty_block(noexclink, newops=extraops)
if extrablock is None:
self.insert_link_conversions(block)
@@ -447,10 +445,9 @@
# cannot insert conversion operations around a single
# link, unless it is the only exit of this block.
# create a new block along the link...
- newblock = insert_empty_block(self.annotator,
- link,
+ newblock = insert_empty_block(link,
# ...and store the conversions there.
- newops=newops)
+ newops=newops)
link = newblock.exits[0]
for i, new_a1 in newlinkargs.items():
link.args[i] = new_a1
diff --git a/rpython/translator/backendopt/constfold.py
b/rpython/translator/backendopt/constfold.py
--- a/rpython/translator/backendopt/constfold.py
+++ b/rpython/translator/backendopt/constfold.py
@@ -171,7 +171,7 @@
v_result.concretetype = nextop.result.concretetype
constants[nextop.result] = v_result
callop = SpaceOperation('direct_call', callargs, v_result)
- newblock = insert_empty_block(None, link, [callop])
+ newblock = insert_empty_block(link, [callop])
[link] = newblock.exits
assert link.target is block
folded_count += 1
@@ -197,7 +197,7 @@
splitlink = block.exits[0]
else:
# split the block at the given position
- splitlink = split_block(None, block, position)
+ splitlink = split_block(block, position)
assert list(block.exits) == [splitlink]
assert link.target is block
assert splitlink.prevblock is block
diff --git a/rpython/translator/backendopt/inline.py
b/rpython/translator/backendopt/inline.py
--- a/rpython/translator/backendopt/inline.py
+++ b/rpython/translator/backendopt/inline.py
@@ -396,7 +396,7 @@
copiedexceptblock.recloseblock(Link(linkargs, blocks[0]))
def do_inline(self, block, index_operation):
- splitlink = split_block(None, block, index_operation)
+ splitlink = split_block(block, index_operation)
afterblock = splitlink.target
# these variables have to be passed along all the links in the inlined
# graph because the original function needs them in the blocks after
diff --git a/rpython/translator/exceptiontransform.py
b/rpython/translator/exceptiontransform.py
--- a/rpython/translator/exceptiontransform.py
+++ b/rpython/translator/exceptiontransform.py
@@ -259,7 +259,7 @@
if not self.raise_analyzer.can_raise(op):
continue
- splitlink = split_block(None, block, i+1)
+ splitlink = split_block(block, i+1)
afterblock = splitlink.target
if lastblock is block:
lastblock = afterblock
@@ -432,7 +432,7 @@
if insert_zeroing_op:
if normalafterblock is None:
- normalafterblock = insert_empty_block(None, l0)
+ normalafterblock = insert_empty_block(l0)
v_result = spaceop.result
if v_result in l0.args:
result_i = l0.args.index(v_result)
diff --git a/rpython/translator/simplify.py b/rpython/translator/simplify.py
--- a/rpython/translator/simplify.py
+++ b/rpython/translator/simplify.py
@@ -1072,7 +1072,7 @@
link.target in stopblocks):
hints['exactlength'] = True
chints = Constant(hints)
- newblock = unsimplify.insert_empty_block(None, link)
+ newblock = unsimplify.insert_empty_block(link)
index = link.args.index(vlist)
vlist2 = newblock.inputargs[index]
vlist3 = Variable(vlist2)
diff --git a/rpython/translator/test/test_unsimplify.py
b/rpython/translator/test/test_unsimplify.py
--- a/rpython/translator/test/test_unsimplify.py
+++ b/rpython/translator/test/test_unsimplify.py
@@ -21,7 +21,7 @@
w = x * y
return z + w
graph, t = translate(f, [int, int])
- split_block(t.annotator, graph.startblock, i)
+ split_block(graph.startblock, i)
checkgraph(graph)
interp = LLInterpreter(t.rtyper)
result = interp.eval_graph(graph, [1, 2])
@@ -35,7 +35,7 @@
else:
return y + 2
graph, t = translate(f, [int, int])
- split_block(t.annotator, graph.startblock, i)
+ split_block(graph.startblock, i)
checkgraph(graph)
interp = LLInterpreter(t.rtyper)
result = interp.eval_graph(graph, [-12, 2])
@@ -61,7 +61,7 @@
return 1
return x
graph, t = translate(catches, [int])
- split_block(t.annotator, graph.startblock, i)
+ split_block(graph.startblock, i)
checkgraph(graph)
interp = LLInterpreter(t.rtyper)
result = interp.eval_graph(graph, [0])
diff --git a/rpython/translator/unsimplify.py b/rpython/translator/unsimplify.py
--- a/rpython/translator/unsimplify.py
+++ b/rpython/translator/unsimplify.py
@@ -7,7 +7,7 @@
var.concretetype = concretetype
return var
-def insert_empty_block(annotator, link, newops=[]):
+def insert_empty_block(link, newops=[]):
"""Insert and return a new block along the given link."""
vars = {}
for v in link.args:
@@ -30,7 +30,7 @@
link.target = newblock
return newblock
-def insert_empty_startblock(annotator, graph):
+def insert_empty_startblock(graph):
vars = [v.copy() for v in graph.startblock.inputargs]
newblock = Block(vars)
newblock.closeblock(Link(vars, graph.startblock))
@@ -41,7 +41,7 @@
and graph.startblock.exitswitch is None
and graph.startblock.exits[0].args == graph.getargs())
-def split_block(annotator, block, index, _forcelink=None):
+def split_block(block, index, _forcelink=None):
"""return a link where prevblock is the block leading up but excluding the
index'th operation and target is a new block with the neccessary variables
passed on.
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
