[pypy-commit] pypy unify-call-ops: Don't fiddle with spaceop.opname in rtypedelegate()

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: unify-call-ops
Changeset: r71696:62eb2cc34cbc
Date: 2014-05-24 17:56 +0100
http://bitbucket.org/pypy/pypy/changeset/62eb2cc34cbc/

Log:	Don't fiddle with spaceop.opname in rtypedelegate()

diff --git a/rpython/rtyper/rcontrollerentry.py b/rpython/rtyper/rcontrollerentry.py
--- a/rpython/rtyper/rcontrollerentry.py
+++ b/rpython/rtyper/rcontrollerentry.py
@@ -1,4 +1,5 @@
 from rpython.flowspace.model import Constant
+from rpython.flowspace.operation import op
 from rpython.rtyper.error import TyperError
 from rpython.rtyper.rmodel import Repr
 from rpython.tool.pairtype import pairtype
@@ -71,5 +72,7 @@
         s_new, r_new = r_controlled.s_real_obj, r_controlled.r_real_obj
         hop2.s_result, hop2.r_result = s_new, r_new
     hop2.v_s_insertfirstarg(c_meth, s_meth)
-    hop2.spaceop.opname = 'simple_call'
+    spaceop = op.simple_call(*hop2.args_v)
+    spaceop.result = hop2.spaceop.result
+    hop2.spaceop = spaceop
     return hop2.dispatch()