Author: Armin Rigo <ar...@tunes.org>
Branch: py3.6
Changeset: r96049:53322e432860
Date: 2019-02-18 10:54 +0100
http://bitbucket.org/pypy/pypy/changeset/53322e432860/
Log: The dummy_get_utf8? line is now not needed any more. Keep it around
in the tests for future reference just in case we need to
reintroduce it, but it is parsed as a comment.
diff --git a/pypy/module/pypyjit/test_pypy_c/model.py
b/pypy/module/pypyjit/test_pypy_c/model.py
--- a/pypy/module/pypyjit/test_pypy_c/model.py
+++ b/pypy/module/pypyjit/test_pypy_c/model.py
@@ -253,7 +253,6 @@
class OpMatcher(object):
- DUMMY = 1000
def __init__(self, ops, id=None):
self.ops = ops
@@ -285,12 +284,11 @@
if line.strip() == 'guard_not_invalidated?':
return 'guard_not_invalidated', None, [], '...', False
if line.strip() == 'dummy_get_utf8?':
- cls.DUMMY += 1
- return ('getfield_gc_r',
- 'p%d' % cls.DUMMY,
- ['ConstPtr(ptr%d)' % cls.DUMMY],
- '<FieldP
pypy.objspace.std.unicodeobject.W_UnicodeObject.inst__utf8 .>',
- False)
+ # this is because unicode used to generate dummy getfield_gc_r
+ # of the _utf8 field. Nowadays it no longer does. This line
+ # is equivalent to a comment now.
+ return None
+
# find the resvar, if any
if ' = ' in line:
resvar, _, line = line.partition(' = ')
diff --git a/pypy/module/pypyjit/test_pypy_c/test_call.py
b/pypy/module/pypyjit/test_pypy_c/test_call.py
--- a/pypy/module/pypyjit/test_pypy_c/test_call.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_call.py
@@ -72,13 +72,12 @@
# LOAD_GLOBAL of OFFSET
ops = entry_bridge.ops_by_id('cond', opcode='LOAD_GLOBAL')
assert log.opnames(ops) == ["guard_value",
- "getfield_gc_r", # dead load
"guard_not_invalidated"]
ops = entry_bridge.ops_by_id('add', opcode='LOAD_GLOBAL')
assert log.opnames(ops) == []
#
ops = entry_bridge.ops_by_id('call', opcode='LOAD_GLOBAL')
- assert log.opnames(ops) == ["getfield_gc_r"]
+ assert log.opnames(ops) == []
#
assert entry_bridge.match_by_id('call', """
dummy_get_utf8?
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
