aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonan Lamy <ronan.lamy@gmail.com>2019-04-06 02:51:16 +0100
committerRonan Lamy <ronan.lamy@gmail.com>2019-04-06 02:51:16 +0100
commita0ac4a4d71e75a0c651bd3b9a0a7bbb45a6e89d7 (patch)
treed170ab6e29f74d4ba2312402b40f8f203d2f5fcd /rpython/jit/metainterp/optimizeopt/rewrite.py
parentCreate ptr2int() helper (diff)
downloadpypy-a0ac4a4d71e75a0c651bd3b9a0a7bbb45a6e89d7.tar.gz
pypy-a0ac4a4d71e75a0c651bd3b9a0a7bbb45a6e89d7.tar.bz2
pypy-a0ac4a4d71e75a0c651bd3b9a0a7bbb45a6e89d7.zip
Move cls_of_box() to cpu and kill rpython.jit.metainterp.typesystem
Diffstat (limited to 'rpython/jit/metainterp/optimizeopt/rewrite.py')
-rw-r--r--rpython/jit/metainterp/optimizeopt/rewrite.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpython/jit/metainterp/optimizeopt/rewrite.py b/rpython/jit/metainterp/optimizeopt/rewrite.py
index 80fa965303..5bc569fb67 100644
--- a/rpython/jit/metainterp/optimizeopt/rewrite.py
+++ b/rpython/jit/metainterp/optimizeopt/rewrite.py
@@ -393,7 +393,7 @@ class OptRewrite(Optimization):
# class cannot possibly match (see test_issue2926)
if info and info.is_constant():
c = self.get_box_replacement(op.getarg(0))
- vtable = optimizer.cpu.ts.cls_of_box(c).getint()
+ vtable = optimizer.cpu.cls_of_box(c).getint()
if optimizer._check_subclass(vtable, op.getarg(1).getint()):
return
raise InvalidLoop("GUARD_SUBCLASS(const) proven to always fail")
@@ -482,7 +482,7 @@ class OptRewrite(Optimization):
'guard that it is not NULL')
previous_classbox = info.get_known_class(self.optimizer.cpu)
if previous_classbox is not None:
- expected_classbox = self.optimizer.cpu.ts.cls_of_box(c_value)
+ expected_classbox = self.optimizer.cpu.cls_of_box(c_value)
assert expected_classbox is not None
if not previous_classbox.same_constant(
expected_classbox):