Author: Carl Friedrich Bolz <[email protected]>
Branch:
Changeset: r47008:2c5ff10a0772
Date: 2011-09-02 09:59 +0200
http://bitbucket.org/pypy/pypy/changeset/2c5ff10a0772/
Log: fix on 64 bit
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
@@ -415,26 +415,26 @@
guard_nonnull_class(p8, ConstClass(W_IntObject), descr=...)
guard_value(i4, 0, descr=...)
guard_value(p3, ConstPtr(ptr14), descr=...)
- i15 = getfield_gc_pure(p8, descr=<SignedFieldDescr
pypy.objspace.std.intobject.W_IntObject.inst_intval 8>)
+ i15 = getfield_gc_pure(p8, descr=<SignedFieldDescr
pypy.objspace.std.intobject.W_IntObject.inst_intval .*>)
i17 = int_lt(i15, 5000)
guard_true(i17, descr=...)
- p18 = getfield_gc(p0, descr=<GcPtrFieldDescr
pypy.interpreter.eval.Frame.inst_w_globals 8>)
+ p18 = getfield_gc(p0, descr=<GcPtrFieldDescr
pypy.interpreter.eval.Frame.inst_w_globals .*>)
guard_value(p18, ConstPtr(ptr19), descr=...)
- p20 = getfield_gc(p18, descr=<GcPtrFieldDescr
pypy.objspace.std.dictmultiobject.W_DictMultiObject.inst_strategy 12>)
+ p20 = getfield_gc(p18, descr=<GcPtrFieldDescr
pypy.objspace.std.dictmultiobject.W_DictMultiObject.inst_strategy .*>)
guard_value(p20, ConstPtr(ptr21), descr=...)
guard_not_invalidated(descr=...)
# most importantly, there is no getarrayitem_gc here
p23 = call(ConstClass(getexecutioncontext), descr=<GcPtrCallDescr>)
- p24 = getfield_gc(p23, descr=<GcPtrFieldDescr
pypy.interpreter.executioncontext.ExecutionContext.inst_topframeref 36>)
+ p24 = getfield_gc(p23, descr=<GcPtrFieldDescr
pypy.interpreter.executioncontext.ExecutionContext.inst_topframeref .*>)
i25 = force_token()
- p26 = getfield_gc(p23, descr=<GcPtrFieldDescr
pypy.interpreter.executioncontext.ExecutionContext.inst_w_tracefunc 44>)
+ p26 = getfield_gc(p23, descr=<GcPtrFieldDescr
pypy.interpreter.executioncontext.ExecutionContext.inst_w_tracefunc .*>)
guard_isnull(p26, descr=...)
- i27 = getfield_gc(p23, descr=<NonGcPtrFieldDescr
pypy.interpreter.executioncontext.ExecutionContext.inst_profilefunc 24>)
+ i27 = getfield_gc(p23, descr=<NonGcPtrFieldDescr
pypy.interpreter.executioncontext.ExecutionContext.inst_profilefunc .*>)
i28 = int_is_zero(i27)
guard_true(i28, descr=...)
- p30 = getfield_gc(ConstPtr(ptr29), descr=<GcPtrFieldDescr
pypy.interpreter.nestedscope.Cell.inst_w_value 8>)
+ p30 = getfield_gc(ConstPtr(ptr29), descr=<GcPtrFieldDescr
pypy.interpreter.nestedscope.Cell.inst_w_value .*>)
guard_nonnull_class(p30, ConstClass(W_IntObject), descr=...)
- i32 = getfield_gc_pure(p30, descr=<SignedFieldDescr
pypy.objspace.std.intobject.W_IntObject.inst_intval 8>)
+ i32 = getfield_gc_pure(p30, descr=<SignedFieldDescr
pypy.objspace.std.intobject.W_IntObject.inst_intval .*>)
i33 = int_add_ovf(i15, i32)
guard_no_overflow(descr=...)
--TICK--
@@ -452,14 +452,14 @@
""", [])
loop, = log.loops_by_id('call')
assert loop.match("""
- i8 = getfield_gc_pure(p6, descr=<SignedFieldDescr
pypy.objspace.std.intobject.W_IntObject.inst_intval 8>)
+ i8 = getfield_gc_pure(p6, descr=<SignedFieldDescr
pypy.objspace.std.intobject.W_IntObject.inst_intval .*>)
i10 = int_lt(i8, 5000)
guard_true(i10, descr=...)
i11 = force_token()
i13 = int_add(i8, 1)
--TICK--
p22 = new_with_vtable(ConstClass(W_IntObject))
- setfield_gc(p22, i13, descr=<SignedFieldDescr
pypy.objspace.std.intobject.W_IntObject.inst_intval 8>)
- setfield_gc(p4, p22, descr=<GcPtrFieldDescr
pypy.interpreter.nestedscope.Cell.inst_w_value 8>)
+ setfield_gc(p22, i13, descr=<SignedFieldDescr
pypy.objspace.std.intobject.W_IntObject.inst_intval .*>)
+ setfield_gc(p4, p22, descr=<GcPtrFieldDescr
pypy.interpreter.nestedscope.Cell.inst_w_value .*>)
jump(p0, p1, p2, p3, p4, p7, p22, p7, descr=<Loop0>)
""")
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
