Author: Armin Rigo <[email protected]>
Branch: gc-del
Changeset: r63698:cafd31ba5a2a
Date: 2013-04-27 16:34 +0200
http://bitbucket.org/pypy/pypy/changeset/cafd31ba5a2a/
Log: Fixes
diff --git a/rpython/jit/backend/llsupport/gc.py
b/rpython/jit/backend/llsupport/gc.py
--- a/rpython/jit/backend/llsupport/gc.py
+++ b/rpython/jit/backend/llsupport/gc.py
@@ -236,7 +236,7 @@
arraydescr.lendescr.offset)
# ____________________________________________________________
-# All code below is for the hybrid or minimark GC
+# All code below is for the minimark GC
class GcRootMap_asmgcc(object):
is_shadow_stack = False
@@ -359,9 +359,8 @@
self.GCClass = None
def _check_valid_gc(self):
- # we need the hybrid or minimark GC for rgc._make_sure_does_not_move()
- # to work. Additionally, 'hybrid' is missing some stuff like
- # jit_remember_young_pointer() for now.
+ # we need the minimark GC for rgc._make_sure_does_not_move()
+ # to work.
if self.gcdescr.config.translation.gc not in ('minimark',):
raise NotImplementedError("--gc=%s not implemented with the JIT" %
(self.gcdescr.config.translation.gc,))
diff --git
a/rpython/jit/backend/x86/test/test_ztranslation_external_exception.py
b/rpython/jit/backend/x86/test/test_ztranslation_external_exception.py
--- a/rpython/jit/backend/x86/test/test_ztranslation_external_exception.py
+++ b/rpython/jit/backend/x86/test/test_ztranslation_external_exception.py
@@ -5,7 +5,7 @@
class TestTranslationRemoveTypePtrX86(TranslationRemoveTypePtrTest):
def _get_TranslationContext(self):
t = TranslationContext()
- t.config.translation.gc = DEFL_GC # 'hybrid' or 'minimark'
+ t.config.translation.gc = DEFL_GC # 'minimark'
t.config.translation.gcrootfinder = 'asmgcc'
t.config.translation.list_comprehension_operations = True
t.config.translation.gcremovetypeptr = True
diff --git a/rpython/jit/metainterp/gc.py b/rpython/jit/metainterp/gc.py
--- a/rpython/jit/metainterp/gc.py
+++ b/rpython/jit/metainterp/gc.py
@@ -13,15 +13,6 @@
class GC_boehm(GcDescription):
malloc_zero_filled = True
-class GC_semispace(GcDescription):
- malloc_zero_filled = True
-
-class GC_generation(GcDescription):
- malloc_zero_filled = True
-
-class GC_hybrid(GcDescription):
- malloc_zero_filled = True
-
class GC_minimark(GcDescription):
malloc_zero_filled = True
diff --git a/rpython/jit/metainterp/test/test_warmspot.py
b/rpython/jit/metainterp/test/test_warmspot.py
--- a/rpython/jit/metainterp/test/test_warmspot.py
+++ b/rpython/jit/metainterp/test/test_warmspot.py
@@ -649,7 +649,7 @@
rtyper = annotate(f, [0])
FakeCPU.rtyper = rtyper
translator = rtyper.annotator.translator
- translator.config.translation.gc = 'hybrid'
+ translator.config.translation.gc = 'minimark'
cls.desc = WarmRunnerDesc(translator, CPUClass=FakeCPU)
cls.FakeDeadFrame = FakeDeadFrame
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
