Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r65753:c454418f5a34
Date: 2013-07-28 12:37 -0700
http://bitbucket.org/pypy/pypy/changeset/c454418f5a34/
Log: Remove some parameters that became unused over the lfietime of this
branch.
diff --git a/rpython/jit/codewriter/call.py b/rpython/jit/codewriter/call.py
--- a/rpython/jit/codewriter/call.py
+++ b/rpython/jit/codewriter/call.py
@@ -190,7 +190,7 @@
return (fnaddr, calldescr)
def getcalldescr(self, op, oopspecindex=EffectInfo.OS_NONE,
- extraeffect=None, extradescrs=None):
+ extraeffect=None):
"""Return the calldescr that describes all calls done by 'op'.
This returns a calldescr that we can put in the corresponding
call operation in the calling jitcode. It gets an effectinfo
@@ -249,7 +249,7 @@
effectinfo = effectinfo_from_writeanalyze(
self.readwrite_analyzer.analyze(op), self.cpu, extraeffect,
oopspecindex, can_invalidate, call_release_gil_target,
- extradescrs)
+ )
#
assert effectinfo is not None
if elidable or loopinvariant:
diff --git a/rpython/jit/codewriter/effectinfo.py
b/rpython/jit/codewriter/effectinfo.py
--- a/rpython/jit/codewriter/effectinfo.py
+++ b/rpython/jit/codewriter/effectinfo.py
@@ -95,13 +95,11 @@
extraeffect=EF_CAN_RAISE,
oopspecindex=OS_NONE,
can_invalidate=False,
- call_release_gil_target=llmemory.NULL,
- extra_descrs=None):
+ call_release_gil_target=llmemory.NULL):
key = (frozenset_or_none(readonly_descrs_fields),
frozenset_or_none(readonly_descrs_arrays),
frozenset_or_none(write_descrs_fields),
frozenset_or_none(write_descrs_arrays),
- frozenset_or_none(extra_descrs),
extraeffect,
oopspecindex,
can_invalidate)
@@ -134,7 +132,6 @@
result.can_invalidate = can_invalidate
result.oopspecindex = oopspecindex
result.call_release_gil_target = call_release_gil_target
- result.extra_descrs = extra_descrs
if result.check_can_raise():
assert oopspecindex in cls._OS_CANRAISE
cls._cache[key] = result
@@ -174,8 +171,7 @@
extraeffect=EffectInfo.EF_CAN_RAISE,
oopspecindex=EffectInfo.OS_NONE,
can_invalidate=False,
- call_release_gil_target=llmemory.NULL,
- extra_descrs=None):
+ call_release_gil_target=llmemory.NULL):
from rpython.translator.backendopt.writeanalyze import top_set
if effects is top_set or extraeffect == EffectInfo.EF_RANDOM_EFFECTS:
readonly_descrs_fields = None
@@ -224,8 +220,7 @@
extraeffect,
oopspecindex,
can_invalidate,
- call_release_gil_target,
- extra_descrs)
+ call_release_gil_target)
def consider_struct(TYPE, fieldname):
if fieldType(TYPE, fieldname) is lltype.Void:
diff --git a/rpython/jit/codewriter/jtransform.py
b/rpython/jit/codewriter/jtransform.py
--- a/rpython/jit/codewriter/jtransform.py
+++ b/rpython/jit/codewriter/jtransform.py
@@ -359,12 +359,11 @@
lst.append(v)
def handle_residual_call(self, op, extraargs=[], may_call_jitcodes=False,
- oopspecindex=EffectInfo.OS_NONE,
extradescrs=None):
+ oopspecindex=EffectInfo.OS_NONE):
"""A direct_call turns into the operation 'residual_call_xxx' if it
is calling a function that we don't want to JIT. The initial args
of 'residual_call_xxx' are the function to call, and its calldescr."""
- calldescr = self.callcontrol.getcalldescr(op,
oopspecindex=oopspecindex,
- extradescrs=extradescrs)
+ calldescr = self.callcontrol.getcalldescr(op,
oopspecindex=oopspecindex)
op1 = self.rewrite_call(op, 'residual_call',
[op.args[0]] + extraargs, calldescr=calldescr)
if may_call_jitcodes or self.callcontrol.calldescr_canraise(calldescr):
diff --git a/rpython/jit/codewriter/test/test_flatten.py
b/rpython/jit/codewriter/test/test_flatten.py
--- a/rpython/jit/codewriter/test/test_flatten.py
+++ b/rpython/jit/codewriter/test/test_flatten.py
@@ -73,7 +73,7 @@
def guess_call_kind(self, op):
return 'residual'
def getcalldescr(self, op, oopspecindex=EffectInfo.OS_NONE,
- extraeffect=None, extradescrs=None):
+ extraeffect=None):
try:
name = op.args[0].value._obj._name
if 'cannot_raise' in name or name.startswith('cast_'):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
