Author: Matti Picus <matti.pi...@gmail.com>
Branch: py3.6
Changeset: r97763:f963c5cf8e2e
Date: 2019-10-11 14:29 +0300
http://bitbucket.org/pypy/pypy/changeset/f963c5cf8e2e/
Log: merge default into py3.6
diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh
--- a/pypy/tool/release/repackage.sh
+++ b/pypy/tool/release/repackage.sh
@@ -1,15 +1,18 @@
# Edit these appropriately before running this script
pmaj=2 # python main version: 2 or 3
pmin=7 # python minor version
-exe=pypy3 # pypy3 or pypy
maj=7
min=2
-rev=0
+rev=0rc2
+case $pmaj in
+ "2") exe=pypy;;
+ "3") exe=pypy3;;
+ *) echo invalid pmaj=$pmaj; exit 1;;
+esac
branchname=release-pypy$pmaj.$pmin-v$maj.x # ==OR== release-v$maj.x # ==OR==
release-v$maj.$min.x
-tagname=release-candidate-pypy$pmaj.$pmin-v$maj.$min.$rev # ==OR==
release-$maj.$min
-# tagname=release-pypy$pmaj.$pmin-v$maj.$min.$rev # ==OR== release-$maj.$min
+tagname=release-pypy$pmaj.$pmin-v$maj.$min.$rev # ==OR== release-$maj.$min
echo checking hg log -r $branchname
hg log -r $branchname || exit 1
diff --git a/rpython/jit/metainterp/quasiimmut.py
b/rpython/jit/metainterp/quasiimmut.py
--- a/rpython/jit/metainterp/quasiimmut.py
+++ b/rpython/jit/metainterp/quasiimmut.py
@@ -27,12 +27,14 @@
return qmut
def make_invalidation_function(STRUCT, mutatefieldname):
- #
+ # fake a repr
+ descr_repr = "FieldDescr(%s, '%s')" % (STRUCT.TO, mutatefieldname)
+
def _invalidate_now(p):
qmut_ptr = getattr(p, mutatefieldname)
setattr(p, mutatefieldname, lltype.nullptr(rclass.OBJECT))
qmut = cast_base_ptr_to_instance(QuasiImmut, qmut_ptr)
- qmut.invalidate(mutatefieldname)
+ qmut.invalidate(descr_repr)
_invalidate_now._dont_inline_ = True
#
def invalidation(p):
@@ -46,7 +48,7 @@
if qmut_ref:
cpu.bh_setfield_gc_r(p, ConstPtr.value, mutatefielddescr)
qmut = cast_gcref_to_instance(QuasiImmut, qmut_ref)
- qmut.invalidate(mutatefielddescr.fieldname)
+ qmut.invalidate(mutatefielddescr.repr_of_descr())
class QuasiImmut(object):
@@ -79,7 +81,7 @@
# already invalidated; see below
self.compress_limit = (len(self.looptokens_wrefs) + 15) * 2
- def invalidate(self, fieldname=None):
+ def invalidate(self, descr_repr=None):
debug_start("jit-invalidate-quasi-immutable")
# When this is called, all the loops that we record become
# invalid: all GUARD_NOT_INVALIDATED in these loops (and
@@ -104,7 +106,7 @@
if not we_are_translated():
self.cpu.stats.invalidated_token_numbers.add(
looptoken.number)
- debug_print("fieldname", fieldname or "<unknown>", "invalidated",
invalidated)
+ debug_print("fieldname", descr_repr or "<unknown>", "invalidated",
invalidated)
debug_stop("jit-invalidate-quasi-immutable")
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
