[pypy-commit] pypy default: Kill a few remaining references to CALL_RELEASE_GIL_R

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r80645:a28496435030
Date: 2015-11-12 10:25 +0100
http://bitbucket.org/pypy/pypy/changeset/a28496435030/

Log:	Kill a few remaining references to CALL_RELEASE_GIL_R

diff --git a/rpython/jit/backend/arm/opassembler.py b/rpython/jit/backend/arm/opassembler.py
--- a/rpython/jit/backend/arm/opassembler.py
+++ b/rpython/jit/backend/arm/opassembler.py
@@ -1169,7 +1169,6 @@
         self._emit_call(op, arglocs, is_call_release_gil=True)
         return fcond
     emit_op_call_release_gil_i = _genop_call_release_gil
-    emit_op_call_release_gil_r = _genop_call_release_gil
     emit_op_call_release_gil_f = _genop_call_release_gil
     emit_op_call_release_gil_n = _genop_call_release_gil
 
diff --git a/rpython/jit/backend/arm/regalloc.py b/rpython/jit/backend/arm/regalloc.py
--- a/rpython/jit/backend/arm/regalloc.py
+++ b/rpython/jit/backend/arm/regalloc.py
@@ -1234,7 +1234,6 @@
         return self._prepare_call(op, save_all_regs=True, first_arg_index=2)
 
     prepare_op_call_release_gil_i = _prepare_op_call_release_gil
-    prepare_op_call_release_gil_r = _prepare_op_call_release_gil
     prepare_op_call_release_gil_f = _prepare_op_call_release_gil
     prepare_op_call_release_gil_n = _prepare_op_call_release_gil
 
diff --git a/rpython/jit/backend/llgraph/runner.py b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -1365,7 +1365,6 @@
 
     execute_call_release_gil_n = _execute_call_release_gil
     execute_call_release_gil_i = _execute_call_release_gil
-    execute_call_release_gil_r = _execute_call_release_gil
     execute_call_release_gil_f = _execute_call_release_gil
 
     def _new_execute_call_assembler(def_val):
diff --git a/rpython/jit/backend/ppc/opassembler.py b/rpython/jit/backend/ppc/opassembler.py
--- a/rpython/jit/backend/ppc/opassembler.py
+++ b/rpython/jit/backend/ppc/opassembler.py
@@ -638,7 +638,6 @@
         self._emit_call(op, arglocs, is_call_release_gil=True)
 
     emit_call_release_gil_i = _genop_call_release_gil
-    emit_call_release_gil_r = _genop_call_release_gil
     emit_call_release_gil_f = _genop_call_release_gil
     emit_call_release_gil_n = _genop_call_release_gil
 
diff --git a/rpython/jit/backend/ppc/regalloc.py b/rpython/jit/backend/ppc/regalloc.py
--- a/rpython/jit/backend/ppc/regalloc.py
+++ b/rpython/jit/backend/ppc/regalloc.py
@@ -1050,7 +1050,6 @@
     prepare_call_may_force_n = _prepare_call_may_force
 
     prepare_call_release_gil_i = _prepare_call_may_force
-    prepare_call_release_gil_r = _prepare_call_may_force
     prepare_call_release_gil_f = _prepare_call_may_force
     prepare_call_release_gil_n = _prepare_call_may_force
 
diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -2106,7 +2106,6 @@
         self._store_force_index(self._find_nearby_operation(+1))
         self._genop_call(op, arglocs, result_loc, is_call_release_gil=True)
     genop_call_release_gil_i = _genop_call_release_gil
-    genop_call_release_gil_r = _genop_call_release_gil
     genop_call_release_gil_f = _genop_call_release_gil
     genop_call_release_gil_n = _genop_call_release_gil
 
diff --git a/rpython/jit/backend/x86/regalloc.py b/rpython/jit/backend/x86/regalloc.py
--- a/rpython/jit/backend/x86/regalloc.py
+++ b/rpython/jit/backend/x86/regalloc.py
@@ -902,7 +902,6 @@
         # [Const(save_err), func_addr, args...]
         self._consider_call(op, guard_not_forced=True, first_arg_index=2)
     consider_call_release_gil_i = _consider_call_release_gil
-    consider_call_release_gil_r = _consider_call_release_gil
     consider_call_release_gil_f = _consider_call_release_gil
     consider_call_release_gil_n = _consider_call_release_gil
     
diff --git a/rpython/jit/metainterp/executor.py b/rpython/jit/metainterp/executor.py
--- a/rpython/jit/metainterp/executor.py
+++ b/rpython/jit/metainterp/executor.py
@@ -376,7 +376,6 @@
                          rop.SETARRAYITEM_RAW,
                          rop.SETINTERIORFIELD_RAW,
                          rop.CALL_RELEASE_GIL_I,
-                         rop.CALL_RELEASE_GIL_R,
                          rop.CALL_RELEASE_GIL_F,
                          rop.CALL_RELEASE_GIL_N,
                          rop.QUASIIMMUT_FIELD,
diff --git a/rpython/jit/metainterp/resoperation.py b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -1170,7 +1170,7 @@
     'CALL_ASSEMBLER/*d/rfin',  # call already compiled assembler
     'CALL_MAY_FORCE/*d/rfin',
     'CALL_LOOPINVARIANT/*d/rfin',
-    'CALL_RELEASE_GIL/*d/rfin',
+    'CALL_RELEASE_GIL/*d/fin',
     # release the GIL and "close the stack" for asmgcc
     'CALL_PURE/*d/rfin',             # removed before it's passed to the backend
     'CALL_MALLOC_GC/*d/r',      # like CALL, but NULL => propagate MemoryError
@@ -1597,8 +1597,8 @@
 
     @staticmethod
     def is_call_release_gil(opnum):
+        # no R returning call_release_gil
         return (opnum == rop.CALL_RELEASE_GIL_I or
-                opnum == rop.CALL_RELEASE_GIL_R or
                 opnum == rop.CALL_RELEASE_GIL_F or
                 opnum == rop.CALL_RELEASE_GIL_N)