[pypy-commit] pypy default: fix more tests

[mattip]

Author: mattip <matti.picus at gmail.com>
Branch: 
Changeset: r79595:4ca3af2a5ea4
Date: 2015-09-12 22:18 +0300
http://bitbucket.org/pypy/pypy/changeset/4ca3af2a5ea4/

Log:	fix more tests

diff --git a/pypy/module/pypyjit/test_pypy_c/test_containers.py b/pypy/module/pypyjit/test_pypy_c/test_containers.py
--- a/pypy/module/pypyjit/test_pypy_c/test_containers.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_containers.py
@@ -43,9 +43,9 @@
         # can't change ;)
         assert loop.match_by_id("getitem", """
             ...
-            i26 = call(ConstClass(ll_call_lookup_function), p18, p6, i25, 0, descr=...)
+            i26 = call_i(ConstClass(ll_call_lookup_function), p18, p6, i25, 0, descr=...)
             ...
-            p33 = getinteriorfield_gc(p31, i26, descr=<InteriorFieldDescr <FieldP odictentry.value .*>>)
+            p33 = getinteriorfield_gc_r(p31, i26, descr=<InteriorFieldDescr <FieldP odictentry.value .*>>)
             ...
         """)
 
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
@@ -1085,7 +1085,7 @@
             # we want to call the function that does the aroundstate
             # manipulation here (as a hack, instead of really doing
             # the aroundstate manipulation ourselves)
-            return self.execute_call_may_force(descr, func, *args)
+            return self._execute_call_may_force(descr, func, *args)
         guard_op = self.lltrace.operations[self.current_index + 1]
         assert guard_op.getopnum() == rop.GUARD_NOT_FORCED
         self.force_guard_op = guard_op