Author: Remi Meier <[email protected]>
Branch: stmgc-c8
Changeset: r80748:c8079c4b84d1
Date: 2015-11-18 09:35 +0100
http://bitbucket.org/pypy/pypy/changeset/c8079c4b84d1/
Log: fix merge
diff --git a/rpython/jit/backend/llsupport/stmrewrite.py
b/rpython/jit/backend/llsupport/stmrewrite.py
--- a/rpython/jit/backend/llsupport/stmrewrite.py
+++ b/rpython/jit/backend/llsupport/stmrewrite.py
@@ -50,7 +50,7 @@
if op.is_call():
self.next_op_may_be_in_new_transaction()
#
- if opnum in (rop.CALL_RELEASE_GIL_I, rop.CALL_RELEASE_GIL_R,
+ if opnum in (rop.CALL_RELEASE_GIL_I,
rop.CALL_RELEASE_GIL_F, rop.CALL_RELEASE_GIL_N):
# self.fallback_inevitable(op)
# is done by assembler._release_gil_shadowstack()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
