Author: Ronan Lamy <[email protected]>
Branch: less-stringly-ops
Changeset: r68285:11e46d3b0aeb
Date: 2013-11-23 12:36 +0100
http://bitbucket.org/pypy/pypy/changeset/11e46d3b0aeb/
Log: kill unnecessary generator_mark SpaceOperation
diff --git a/rpython/flowspace/generator.py b/rpython/flowspace/generator.py
--- a/rpython/flowspace/generator.py
+++ b/rpython/flowspace/generator.py
@@ -98,10 +98,6 @@
# First, always run simplify_graph in order to reduce the number of
# variables passed around
simplify_graph(graph)
- #
- assert graph.startblock.operations[0].opname == 'generator_mark'
- graph.startblock.operations.pop(0)
- #
insert_empty_startblock(None, graph)
_insert_reads(graph.startblock, Entry.varnames)
Entry.block = graph.startblock
diff --git a/rpython/flowspace/pygraph.py b/rpython/flowspace/pygraph.py
--- a/rpython/flowspace/pygraph.py
+++ b/rpython/flowspace/pygraph.py
@@ -1,8 +1,7 @@
"""
Implements flow graphs for Python callables
"""
-from rpython.flowspace.model import (FunctionGraph, Constant, Variable,
- SpaceOperation)
+from rpython.flowspace.model import FunctionGraph, Constant, Variable
from rpython.flowspace.framestate import FrameState
class PyGraph(FunctionGraph):
@@ -17,10 +16,6 @@
data[i] = Variable()
state = FrameState(data + [Constant(None), Constant(None)], [], 0)
initialblock = SpamBlock(state)
- if code.is_generator:
- initialblock.operations.append(
- SpaceOperation('generator_mark', [], Variable()))
-
super(PyGraph, self).__init__(self._sanitize_funcname(func),
initialblock)
self.func = func
self.signature = code.signature
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
