[pypy-commit] pypy jit-settrace: Updated pypyjit for new code

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: jit-settrace
Changeset: r67620:7ec5aa732241
Date: 2013-10-25 15:34 -0700
http://bitbucket.org/pypy/pypy/changeset/7ec5aa732241/

Log:	Updated pypyjit for new code

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
@@ -426,29 +426,27 @@
         assert loop.match("""
             guard_value(i4, 1, descr=...)
             guard_nonnull_class(p12, ConstClass(W_IntObject), descr=...)
-            p20 = getfield_gc(p1, descr=<FieldP pypy.interpreter.executioncontext.ExecutionContext.inst_w_tracefunc .*>)
-            guard_value(p20, ConstPtr(ptr21), descr=...)
             guard_value(i8, 0, descr=...)
-            guard_value(p2, ConstPtr(ptr23), descr=...)
-            i24 = getfield_gc_pure(p12, descr=<FieldS pypy.objspace.std.intobject.W_IntObject.inst_intval .*>)
-            i26 = int_lt(i24, 5000)
-            guard_true(i26, descr=...)
-            guard_value(p7, ConstPtr(ptr27), descr=...)
-            p28 = getfield_gc(p7, descr=<FieldP pypy.objspace.std.dictmultiobject.W_DictMultiObject.inst_strategy .*>)
-            guard_value(p28, ConstPtr(ptr29), descr=...)
+            guard_value(p2, ConstPtr(ptr21), descr=...)
+            i22 = getfield_gc_pure(p12, descr=<FieldS pypy.objspace.std.intobject.W_IntObject.inst_intval .*>)
+            i24 = int_lt(i22, 5000)
+            guard_true(i24, descr=...)
+            guard_value(p7, ConstPtr(ptr25), descr=...)
+            p26 = getfield_gc(p7, descr=<FieldP pypy.objspace.std.dictmultiobject.W_DictMultiObject.inst_strategy .*>)
+            guard_value(p26, ConstPtr(ptr27), descr=...)
             guard_not_invalidated(descr=...)
-            p31 = call(ConstClass(getexecutioncontext), descr=<Callr 8 EF=1>)
-            p32 = getfield_gc(p31, descr=<FieldP pypy.interpreter.executioncontext.ExecutionContext.inst_topframeref .*>)
-            p33 = force_token()
-            p34 = getfield_gc(p31, descr=<FieldP pypy.interpreter.executioncontext.ExecutionContext.inst_w_tracefunc .*>)
-            guard_value(p34, ConstPtr(ptr35), descr=...)
-            i36 = getfield_gc(p31, descr=<FieldU pypy.interpreter.executioncontext.ExecutionContext.inst_profilefunc .*>)
-            i37 = int_is_zero(i36)
-            guard_true(i37, descr=...)
-            p39 = getfield_gc(ConstPtr(ptr38), descr=<FieldP pypy.interpreter.nestedscope.Cell.inst_w_value .*>)
-            guard_nonnull_class(p39, ConstClass(W_IntObject), descr=...)
-            i41 = getfield_gc_pure(p39, descr=<FieldS pypy.objspace.std.intobject.W_IntObject.inst_intval .*>)
-            i42 = int_add_ovf(i24, i41)
+            p29 = call(ConstClass(getexecutioncontext), descr=<Callr 8 EF=1>)
+            p30 = getfield_gc(p29, descr=<FieldP pypy.interpreter.executioncontext.ExecutionContext.inst_topframeref .*>)
+            p31 = force_token()
+            p32 = getfield_gc(p29, descr=<FieldP pypy.interpreter.executioncontext.ExecutionContext.inst_w_tracefunc .*>)
+            guard_value(p32, ConstPtr(ptr33), descr=...)
+            i34 = getfield_gc(p29, descr=<FieldU pypy.interpreter.executioncontext.ExecutionContext.inst_profilefunc .*>)
+            i35 = int_is_zero(i34)
+            guard_true(i35, descr=...)
+            p37 = getfield_gc(ConstPtr(ptr36), descr=<FieldP pypy.interpreter.nestedscope.Cell.inst_w_value .*>)
+            guard_nonnull_class(p37, ConstClass(W_IntObject), descr=...)
+            i39 = getfield_gc_pure(p37, descr=<FieldS pypy.objspace.std.intobject.W_IntObject.inst_intval .*>)
+            i40 = int_add_ovf(i22, i39)
             guard_no_overflow(descr=...)
             guard_not_invalidated(descr=...)
             --TICK--
diff --git a/pypy/module/pypyjit/test_pypy_c/test_thread.py b/pypy/module/pypyjit/test_pypy_c/test_thread.py
--- a/pypy/module/pypyjit/test_pypy_c/test_thread.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_thread.py
@@ -60,33 +60,29 @@
         assert log.result == main(500)
         loop, = log.loops_by_filename(self.filepath)
         assert loop.match("""
-        i63 = int_gt(i48, 0)
-        guard_true(i63, descr=...)
-        p64 = force_token()
-        setfield_gc(p0, p64, descr=<FieldP pypy.interpreter.pyframe.PyFrame.vable_token .*>)
-        i65 = call_release_gil(..., i39, 1, descr=<Calli 4 ii EF=6>)
+        i56 = int_gt(i44, 0)
+        guard_true(i56, descr=...)
+        p57 = force_token()
+        setfield_gc(p0, p57, descr=<FieldP pypy.interpreter.pyframe.PyFrame.vable_token 8>)
+        i58 = call_release_gil(..., i37, 1, descr=<Calli 4 ii EF=6>)
         guard_not_forced(descr=...)
         guard_no_exception(descr=...)
-        i66 = int_is_true(i65)
-        guard_true(i66, descr=...)
-        p67 = getfield_gc(p1, descr=<FieldP pypy.interpreter.executioncontext.ExecutionContext.inst_w_tracefunc .*>)
-        guard_value(p67, ConstPtr(ptr46), descr=...)
-        i68 = int_sub(i48, 1)
+        i59 = int_is_true(i58)
+        guard_true(i59, descr=...)
+        i60 = int_sub(i44, 1)
         guard_not_invalidated(descr=...)
-        p69 = force_token()
-        setfield_gc(p0, p69, descr=<FieldP pypy.interpreter.pyframe.PyFrame.vable_token .*>)
-        i70 = call_release_gil(..., i39, 0, descr=<Calli 4 ii EF=6>)
+        p62 = force_token()
+        setfield_gc(p0, p62, descr=<FieldP pypy.interpreter.pyframe.PyFrame.vable_token 8>)
+        i63 = call_release_gil(..., i37, 0, descr=<Calli 4 ii EF=6>)
         guard_not_forced(descr=...)
         guard_no_exception(descr=...)
-        i71 = int_is_true(i70)
-        guard_false(i71, descr=...)
-        p72 = force_token()
-        setfield_gc(p0, p72, descr=<FieldP pypy.interpreter.pyframe.PyFrame.vable_token .*>)
-        call_release_gil(..., i39, descr=<Callv 0 i EF=6>)
+        i64 = int_is_true(i63)
+        guard_false(i64, descr=...)
+        p65 = force_token()
+        setfield_gc(p0, p65, descr=<FieldP pypy.interpreter.pyframe.PyFrame.vable_token 8>)
+        call_release_gil(..., i37, descr=<Callv 0 i EF=6>)
         guard_not_forced(descr=...)
         guard_no_exception(descr=...)
-        p73 = getfield_gc(p1, descr=<FieldP pypy.interpreter.executioncontext.ExecutionContext.inst_w_tracefunc .*>)
-        guard_value(p73, ConstPtr(ptr58), descr=...)
         guard_not_invalidated(descr=...)
         --TICK--
         jump(..., descr=...)