[pypy-commit] pypy cleanup-llgraph-backend: (fijal, arigo) Remove more of the OOJitMixin usages.
arigo
noreply at buildbot.pypy.org
Wed Oct 17 16:34:52 CEST 2012
Author: Armin Rigo <arigo at tunes.org>
Branch: cleanup-llgraph-backend
Changeset: r58173:24b34b9f1bb8
Date: 2012-10-17 16:34 +0200
http://bitbucket.org/pypy/pypy/changeset/24b34b9f1bb8/
Log: (fijal, arigo) Remove more of the OOJitMixin usages.
diff --git a/pypy/jit/metainterp/quasiimmut.py b/pypy/jit/metainterp/quasiimmut.py
--- a/pypy/jit/metainterp/quasiimmut.py
+++ b/pypy/jit/metainterp/quasiimmut.py
@@ -22,7 +22,7 @@
qmut = QuasiImmut.show(cpu, qmut_gcref)
else:
qmut = QuasiImmut(cpu)
- cpu.bh_setfield_gc_r(gcref, mutatefielddescr, qmut.hide())
+ cpu.bh_setfield_gc_r(gcref, qmut.hide(), mutatefielddescr)
return qmut
def make_invalidation_function(STRUCT, mutatefieldname):
@@ -43,7 +43,7 @@
def do_force_quasi_immutable(cpu, p, mutatefielddescr):
qmut_ref = cpu.bh_getfield_gc_r(p, mutatefielddescr)
if qmut_ref:
- cpu.bh_setfield_gc_r(p, mutatefielddescr, cpu.ts.NULLREF)
+ cpu.bh_setfield_gc_r(p, cpu.ts.NULLREF, mutatefielddescr)
qmut_ptr = lltype.cast_opaque_ptr(rclass.OBJECTPTR, qmut_ref)
qmut = cast_base_ptr_to_instance(QuasiImmut, qmut_ptr)
qmut.invalidate()
diff --git a/pypy/jit/metainterp/test/test_ajit.py b/pypy/jit/metainterp/test/test_ajit.py
--- a/pypy/jit/metainterp/test/test_ajit.py
+++ b/pypy/jit/metainterp/test/test_ajit.py
@@ -3757,8 +3757,6 @@
res = self.interp_operations(f, [x])
assert res == x or isnan(x) and isnan(res)
-
-class TestLLtype(BaseLLtypeTests, LLJitMixin):
def test_tagged(self):
from pypy.rlib.objectmodel import UnboxedValue
class Base(object):
@@ -3883,3 +3881,7 @@
return 42
self.interp_operations(f, [1, 2, 3])
self.check_operations_history(call=1, guard_no_exception=0)
+
+
+class TestLLtype(BaseLLtypeTests, LLJitMixin):
+ pass
diff --git a/pypy/jit/metainterp/test/test_blackhole.py b/pypy/jit/metainterp/test/test_blackhole.py
--- a/pypy/jit/metainterp/test/test_blackhole.py
+++ b/pypy/jit/metainterp/test/test_blackhole.py
@@ -1,6 +1,6 @@
import py
from pypy.rlib.jit import JitDriver
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.jit.metainterp.blackhole import BlackholeInterpBuilder
from pypy.jit.metainterp.blackhole import BlackholeInterpreter
from pypy.jit.metainterp.blackhole import convert_and_run_from_pyjitpl
@@ -15,7 +15,7 @@
class FakeAssembler:
pass
class FakeCPU:
- def bh_call_i(self, func, calldescr, args_i, args_r, args_f):
+ def bh_call_i(self, func, args_i, args_r, args_f, calldescr):
assert func == 321
assert calldescr == "<calldescr>"
if args_i[0] < 0:
diff --git a/pypy/jit/metainterp/test/test_compile.py b/pypy/jit/metainterp/test/test_compile.py
--- a/pypy/jit/metainterp/test/test_compile.py
+++ b/pypy/jit/metainterp/test/test_compile.py
@@ -152,7 +152,7 @@
from pypy.rpython.annlowlevel import llhelper
from pypy.rpython.llinterp import LLException
#
- cpu = runner.LLtypeCPU(None)
+ cpu = runner.LLGraphCPU(None)
FUNC = lltype.FuncType([lltype.Signed]*4, lltype.Signed)
def ll_portal_runner(g1, g2, r3, r4):
assert (g1, g2, r3, r4) == (12, 34, -156, -178)
diff --git a/pypy/jit/metainterp/test/test_del.py b/pypy/jit/metainterp/test/test_del.py
--- a/pypy/jit/metainterp/test/test_del.py
+++ b/pypy/jit/metainterp/test/test_del.py
@@ -2,7 +2,7 @@
from pypy.rlib.jit import JitDriver, dont_look_inside
from pypy.rlib.objectmodel import keepalive_until_here
from pypy.rlib import rgc
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
class DelTests:
@@ -124,7 +124,6 @@
assert res == 1001
-class TestLLtype(DelTests, LLJitMixin):
def test_signal_action(self):
from pypy.module.signal.interp_signal import SignalActionFlag
action = SignalActionFlag()
@@ -148,7 +147,6 @@
self.meta_interp(f, [20])
self.check_resops(call_pure=0, setfield_raw=2, call=0, getfield_raw=2)
-class TestOOtype(DelTests, OOJitMixin):
- def setup_class(cls):
- py.test.skip("XXX dels are not implemented in the"
- " static CLI or JVM backend")
+
+class TestLLtype(DelTests, LLJitMixin):
+ pass
diff --git a/pypy/jit/metainterp/test/test_dict.py b/pypy/jit/metainterp/test/test_dict.py
--- a/pypy/jit/metainterp/test/test_dict.py
+++ b/pypy/jit/metainterp/test/test_dict.py
@@ -1,5 +1,5 @@
import py
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.rlib.jit import JitDriver
from pypy.rlib import objectmodel
@@ -178,8 +178,5 @@
'jump': 1})
-class TestOOtype(DictTests, OOJitMixin):
- pass
-
class TestLLtype(DictTests, LLJitMixin):
pass
diff --git a/pypy/jit/metainterp/test/test_exception.py b/pypy/jit/metainterp/test/test_exception.py
--- a/pypy/jit/metainterp/test/test_exception.py
+++ b/pypy/jit/metainterp/test/test_exception.py
@@ -1,5 +1,5 @@
import py, sys
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.rlib.jit import JitDriver, dont_look_inside
from pypy.rlib.rarithmetic import ovfcheck, LONG_BIT, intmask
from pypy.jit.codewriter.policy import StopAtXPolicy
@@ -617,8 +617,5 @@
self.n = n
-class TestOOtype(ExceptionTests, OOJitMixin):
- pass
-
class TestLLtype(ExceptionTests, LLJitMixin):
pass
diff --git a/pypy/jit/metainterp/test/test_float.py b/pypy/jit/metainterp/test/test_float.py
--- a/pypy/jit/metainterp/test/test_float.py
+++ b/pypy/jit/metainterp/test/test_float.py
@@ -1,5 +1,5 @@
import math, sys
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.rlib.rarithmetic import intmask, r_uint
@@ -75,8 +75,5 @@
assert type(res) is float and res == float(long(r_uint(-12345)))
-class TestOOtype(FloatTests, OOJitMixin):
- pass
-
class TestLLtype(FloatTests, LLJitMixin):
pass
diff --git a/pypy/jit/metainterp/test/test_greenfield.py b/pypy/jit/metainterp/test/test_greenfield.py
--- a/pypy/jit/metainterp/test/test_greenfield.py
+++ b/pypy/jit/metainterp/test/test_greenfield.py
@@ -1,4 +1,4 @@
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.rlib.jit import JitDriver
@@ -55,6 +55,3 @@
class TestLLtypeGreenFieldsTests(GreenFieldsTests, LLJitMixin):
pass
-
-class TestOOtypeGreenFieldsTests(GreenFieldsTests, OOJitMixin):
- pass
diff --git a/pypy/jit/metainterp/test/test_immutable.py b/pypy/jit/metainterp/test/test_immutable.py
--- a/pypy/jit/metainterp/test/test_immutable.py
+++ b/pypy/jit/metainterp/test/test_immutable.py
@@ -1,5 +1,5 @@
from pypy.rlib import jit
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
@jit.dont_look_inside
def escape(x):
@@ -177,6 +177,3 @@
class TestLLtypeImmutableFieldsTests(ImmutableFieldsTests, LLJitMixin):
pass
-
-class TestOOtypeImmutableFieldsTests(ImmutableFieldsTests, OOJitMixin):
- pass
diff --git a/pypy/jit/metainterp/test/test_jitdriver.py b/pypy/jit/metainterp/test/test_jitdriver.py
--- a/pypy/jit/metainterp/test/test_jitdriver.py
+++ b/pypy/jit/metainterp/test/test_jitdriver.py
@@ -1,6 +1,6 @@
"""Tests for multiple JitDrivers."""
from pypy.rlib.jit import JitDriver, unroll_safe, set_param
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.jit.metainterp.warmspot import get_stats
@@ -145,6 +145,3 @@
class TestLLtype(MultipleJitDriversTests, LLJitMixin):
pass
-
-class TestOOtype(MultipleJitDriversTests, OOJitMixin):
- pass
diff --git a/pypy/jit/metainterp/test/test_list.py b/pypy/jit/metainterp/test/test_list.py
--- a/pypy/jit/metainterp/test/test_list.py
+++ b/pypy/jit/metainterp/test/test_list.py
@@ -1,7 +1,7 @@
import py
from pypy.rlib.objectmodel import newlist_hint
from pypy.rlib.jit import JitDriver
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
class ListTests:
@@ -261,10 +261,6 @@
r = self.interp_operations(f, [-1])
assert r == 0
-class TestOOtype(ListTests, OOJitMixin):
- pass
-
-class TestLLtype(ListTests, LLJitMixin):
def test_listops_dont_invalidate_caches(self):
class A(object):
pass
@@ -292,3 +288,7 @@
# There is the one actual field on a, plus several fields on the list
# itself
self.check_resops(getfield_gc=10)
+
+
+class TestLLtype(ListTests, LLJitMixin):
+ pass
diff --git a/pypy/jit/metainterp/test/test_loop.py b/pypy/jit/metainterp/test/test_loop.py
--- a/pypy/jit/metainterp/test/test_loop.py
+++ b/pypy/jit/metainterp/test/test_loop.py
@@ -2,7 +2,7 @@
from pypy.rlib.jit import JitDriver, hint, set_param
from pypy.rlib.objectmodel import compute_hash
from pypy.jit.metainterp.warmspot import ll_meta_interp, get_stats
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.jit.codewriter.policy import StopAtXPolicy
from pypy.jit.metainterp.resoperation import rop
from pypy.jit.metainterp import history
@@ -907,8 +907,6 @@
res = self.meta_interp(f, [20, 10])
assert res == f(20, 10)
-class TestOOtype(LoopTest, OOJitMixin):
- pass
class TestLLtype(LoopTest, LLJitMixin):
pass
diff --git a/pypy/jit/metainterp/test/test_loop_unroll.py b/pypy/jit/metainterp/test/test_loop_unroll.py
--- a/pypy/jit/metainterp/test/test_loop_unroll.py
+++ b/pypy/jit/metainterp/test/test_loop_unroll.py
@@ -1,7 +1,7 @@
import py
from pypy.rlib.jit import JitDriver
from pypy.jit.metainterp.test import test_loop
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.jit.metainterp.optimizeopt import ALL_OPTS_NAMES
class LoopUnrollTest(test_loop.LoopTest):
@@ -16,7 +16,3 @@
class TestLLtype(LoopUnrollTest, LLJitMixin):
pass
-
-class TestOOtype(LoopUnrollTest, OOJitMixin):
- pass
-
diff --git a/pypy/jit/metainterp/test/test_loop_unroll_disopt.py b/pypy/jit/metainterp/test/test_loop_unroll_disopt.py
--- a/pypy/jit/metainterp/test/test_loop_unroll_disopt.py
+++ b/pypy/jit/metainterp/test/test_loop_unroll_disopt.py
@@ -1,7 +1,7 @@
import py
from pypy.rlib.jit import JitDriver
from pypy.jit.metainterp.test import test_loop
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.jit.metainterp.optimizeopt import ALL_OPTS_NAMES
allopts = ALL_OPTS_NAMES.split(':')
diff --git a/pypy/jit/metainterp/test/test_math.py b/pypy/jit/metainterp/test/test_math.py
--- a/pypy/jit/metainterp/test/test_math.py
+++ b/pypy/jit/metainterp/test/test_math.py
@@ -1,5 +1,5 @@
import math
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.rlib.rfloat import isinf, isnan, INFINITY, NAN
class MathTests:
@@ -40,8 +40,5 @@
self.check_operations_history(call_pure=0)
-class TestOOtype(MathTests, OOJitMixin):
- pass
-
class TestLLtype(MathTests, LLJitMixin):
pass
diff --git a/pypy/jit/metainterp/test/test_recursive.py b/pypy/jit/metainterp/test/test_recursive.py
--- a/pypy/jit/metainterp/test/test_recursive.py
+++ b/pypy/jit/metainterp/test/test_recursive.py
@@ -3,7 +3,7 @@
from pypy.rlib.jit import unroll_safe, dont_look_inside, promote
from pypy.rlib.objectmodel import we_are_translated
from pypy.rlib.debug import fatalerror
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.jit.codewriter.policy import StopAtXPolicy
from pypy.rpython.annlowlevel import hlstr
from pypy.jit.metainterp.warmspot import get_stats
@@ -1265,6 +1265,3 @@
class TestLLtype(RecursiveTests, LLJitMixin):
pass
-
-class TestOOtype(RecursiveTests, OOJitMixin):
- pass
diff --git a/pypy/jit/metainterp/test/test_send.py b/pypy/jit/metainterp/test/test_send.py
--- a/pypy/jit/metainterp/test/test_send.py
+++ b/pypy/jit/metainterp/test/test_send.py
@@ -1,7 +1,7 @@
import py
from pypy.rlib.jit import JitDriver, promote, elidable, set_param
from pypy.jit.codewriter.policy import StopAtXPolicy
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
class SendTests(object):
@@ -635,8 +635,5 @@
assert res == 21
-class TestOOtype(SendTests, OOJitMixin):
- pass
-
class TestLLtype(SendTests, LLJitMixin):
pass
diff --git a/pypy/jit/metainterp/test/test_slist.py b/pypy/jit/metainterp/test/test_slist.py
--- a/pypy/jit/metainterp/test/test_slist.py
+++ b/pypy/jit/metainterp/test/test_slist.py
@@ -1,5 +1,5 @@
import py
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.rlib.jit import JitDriver
class ListTests(object):
@@ -94,9 +94,6 @@
assert res == 41
self.check_resops(call=0, guard_value=0)
-# we don't support resizable lists on ootype
-#class TestOOtype(ListTests, OOJitMixin):
-# pass
class TestLLtype(ListTests, LLJitMixin):
pass
diff --git a/pypy/jit/metainterp/test/test_string.py b/pypy/jit/metainterp/test/test_string.py
--- a/pypy/jit/metainterp/test/test_string.py
+++ b/pypy/jit/metainterp/test/test_string.py
@@ -1,7 +1,7 @@
import py
from pypy.jit.codewriter.policy import StopAtXPolicy
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.rlib.debug import debug_print
from pypy.rlib.jit import JitDriver, dont_look_inside, we_are_jitted,\
promote_string
@@ -30,7 +30,7 @@
return i
res = self.meta_interp(f, [10, True, _str('h')], listops=True)
assert res == 5
- self.check_resops(**{self.CALL: 1, self.CALL_PURE: 0})
+ self.check_resops(call=1, call_pure=0)
def test_eq_folded(self):
_str = self._str
@@ -50,7 +50,7 @@
return i
res = self.meta_interp(f, [10, True, _str('h')], listops=True)
assert res == 5
- self.check_resops(**{self.CALL: 0, self.CALL_PURE: 0})
+ self.check_resops(call=0, call_pure=0)
def test_newstr(self):
_str, _chr = self._str, self._chr
@@ -516,13 +516,9 @@
self.meta_interp(f, [0])
self.check_resops(call=7)
-#class TestOOtype(StringTests, OOJitMixin):
-# CALL = "oosend"
-# CALL_PURE = "oosend_pure"
class TestLLtype(StringTests, LLJitMixin):
- CALL = "call"
- CALL_PURE = "call_pure"
+ pass
class TestLLtypeUnicode(TestLLtype):
_str, _chr = unicode, unichr
diff --git a/pypy/jit/metainterp/test/test_tl.py b/pypy/jit/metainterp/test/test_tl.py
--- a/pypy/jit/metainterp/test/test_tl.py
+++ b/pypy/jit/metainterp/test/test_tl.py
@@ -1,6 +1,6 @@
import py
from pypy.jit.codewriter.policy import StopAtXPolicy
-from pypy.jit.metainterp.test.support import OOJitMixin, LLJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
class ToyLanguageTests:
@@ -141,8 +141,6 @@
meth_func = meth.im_func
del meth_func._jit_look_inside_
-class TestOOtype(ToyLanguageTests, OOJitMixin):
- pass
class TestLLtype(ToyLanguageTests, LLJitMixin):
pass
diff --git a/pypy/jit/metainterp/test/test_tlc.py b/pypy/jit/metainterp/test/test_tlc.py
--- a/pypy/jit/metainterp/test/test_tlc.py
+++ b/pypy/jit/metainterp/test/test_tlc.py
@@ -3,7 +3,7 @@
from pypy.jit.tl import tlc
-from pypy.jit.metainterp.test.support import OOJitMixin, LLJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
class TLCTests:
diff --git a/pypy/jit/metainterp/test/test_virtual.py b/pypy/jit/metainterp/test/test_virtual.py
--- a/pypy/jit/metainterp/test/test_virtual.py
+++ b/pypy/jit/metainterp/test/test_virtual.py
@@ -2,7 +2,7 @@
from pypy.rlib.jit import JitDriver, promote, dont_look_inside
from pypy.rlib.objectmodel import compute_unique_id
from pypy.jit.codewriter.policy import StopAtXPolicy
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.rpython.lltypesystem import lltype, rclass
from pypy.rpython.lltypesystem.lloperation import llop
from pypy.rpython.ootypesystem import ootype
@@ -1178,15 +1178,6 @@
self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc=0,
new=0)
-class TestOOtype_Instance(VirtualTests, OOJitMixin):
- _new_op = 'new_with_vtable'
- _field_prefix = 'o'
-
- @staticmethod
- def _new():
- return MyClass()
-
- test_class_with_default_fields = TestLLtype_Instance.test_class_with_default_fields.im_func
# ____________________________________________________________
# Run 2: all the tests use lltype.malloc to make a NODE
@@ -1204,19 +1195,6 @@
return lltype.malloc(NODE)
-OONODE = ootype.Instance('NODE', ootype.ROOT, {})
-OONODE._add_fields({'value': ootype.Signed,
- 'floatval' : ootype.Float,
- 'extra': ootype.Signed})
-
-class TestOOtype_NotObject(VirtualTests, OOJitMixin):
- _new_op = 'new_with_vtable'
- _field_prefix = ''
-
- @staticmethod
- def _new():
- return ootype.new(OONODE)
-
# ____________________________________________________________
# Run 3: all the tests use lltype.malloc to make a NODE2
# (same as Run 2 but it is part of the OBJECT hierarchy)
@@ -1239,10 +1217,9 @@
p.parent.typeptr = vtable2
return p
+
+# ____________________________________________________________
# misc
-class TestOOTypeMisc(VirtualMiscTests, OOJitMixin):
- pass
-
class TestLLTypeMisc(VirtualMiscTests, LLJitMixin):
pass
diff --git a/pypy/jit/metainterp/test/test_virtualizable.py b/pypy/jit/metainterp/test/test_virtualizable.py
--- a/pypy/jit/metainterp/test/test_virtualizable.py
+++ b/pypy/jit/metainterp/test/test_virtualizable.py
@@ -7,7 +7,7 @@
from pypy.jit.codewriter import heaptracker
from pypy.rlib.jit import JitDriver, hint, dont_look_inside, promote
from pypy.rlib.rarithmetic import intmask
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.rpython.rclass import FieldListAccessor
from pypy.jit.metainterp.warmspot import get_stats, get_translator
from pypy.jit.metainterp import history
@@ -1374,12 +1374,7 @@
print main(100)
res = self.meta_interp(main, [100], inline=True, enable_opts='')
-class TestOOtype(#ExplicitVirtualizableTests,
- ImplicitVirtualizableTests,
- OOJitMixin):
- pass
-
class TestLLtype(ExplicitVirtualizableTests,
ImplicitVirtualizableTests,
LLJitMixin):
diff --git a/pypy/jit/metainterp/test/test_virtualref.py b/pypy/jit/metainterp/test/test_virtualref.py
--- a/pypy/jit/metainterp/test/test_virtualref.py
+++ b/pypy/jit/metainterp/test/test_virtualref.py
@@ -5,7 +5,7 @@
from pypy.rlib.jit import virtual_ref, virtual_ref_finish, InvalidVirtualRef
from pypy.rlib.jit import non_virtual_ref
from pypy.rlib.objectmodel import compute_unique_id
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin, _get_jitcodes
+from pypy.jit.metainterp.test.support import LLJitMixin, _get_jitcodes
from pypy.jit.metainterp.resoperation import rop
from pypy.jit.metainterp.virtualref import VirtualRefInfo
diff --git a/pypy/jit/metainterp/test/test_warmspot.py b/pypy/jit/metainterp/test/test_warmspot.py
--- a/pypy/jit/metainterp/test/test_warmspot.py
+++ b/pypy/jit/metainterp/test/test_warmspot.py
@@ -3,7 +3,7 @@
from pypy.rlib.jit import JitDriver, set_param, unroll_safe
from pypy.jit.backend.llgraph import runner
-from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.support import LLJitMixin
from pypy.jit.metainterp.optimizeopt import ALL_OPTS_NAMES
@@ -313,12 +313,8 @@
class TestLLWarmspot(WarmspotTests, LLJitMixin):
- CPUClass = runner.LLtypeCPU
- type_system = 'lltype'
+ pass
-class TestOOWarmspot(WarmspotTests, OOJitMixin):
- ##CPUClass = runner.OOtypeCPU
- type_system = 'ootype'
class TestWarmspotDirect(object):
def setup_class(cls):
More information about the pypy-commit
mailing list