Author: David Schneider <[email protected]>
Branch: ppc-jit-backend
Changeset: r49401:deb6836af9be
Date: 2011-11-14 14:46 +0100
http://bitbucket.org/pypy/pypy/changeset/deb6836af9be/
Log: more test fixes
diff --git a/pypy/jit/backend/test/test_frame_size.py
b/pypy/jit/backend/test/test_frame_size.py
--- a/pypy/jit/backend/test/test_frame_size.py
+++ b/pypy/jit/backend/test/test_frame_size.py
@@ -15,6 +15,7 @@
from pypy.rpython.annlowlevel import llhelper
from pypy.rpython.llinterp import LLException
from pypy.jit.codewriter import heaptracker, longlong
+from pypy.jit.codewriter.effectinfo import EffectInfo
from pypy.rlib.rarithmetic import intmask
from pypy.jit.backend.detect_cpu import getcpuclass
@@ -31,7 +32,8 @@
F1PTR = lltype.Ptr(lltype.FuncType([lltype.Signed], lltype.Signed))
f1ptr = llhelper(F1PTR, f1)
- f1_calldescr = cpu.calldescrof(F1PTR.TO, F1PTR.TO.ARGS, F1PTR.TO.RESULT)
+ f1_calldescr = cpu.calldescrof(F1PTR.TO, F1PTR.TO.ARGS,
+ F1PTR.TO.RESULT, EffectInfo.MOST_GENERAL)
namespace = locals().copy()
type_system = 'lltype'
diff --git a/pypy/jit/codewriter/heaptracker.py
b/pypy/jit/codewriter/heaptracker.py
--- a/pypy/jit/codewriter/heaptracker.py
+++ b/pypy/jit/codewriter/heaptracker.py
@@ -97,7 +97,7 @@
def finish_registering(cpu):
# annotation hack for small examples which have no vtable at all
- if cpu._all_size_descrs_with_vtable is None:
+ if not hasattr(cpu, '_all_size_descrs_with_vtable') or
cpu._all_size_descrs_with_vtable is None:
vtable = lltype.malloc(rclass.OBJECT_VTABLE, immortal=True)
register_known_gctype(cpu, vtable, rclass.OBJECT)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
