Commits

Armin Rigo committed cafd31b

Fixes

Comments (0)

Files changed (4)

rpython/jit/backend/llsupport/gc.py

                                  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
         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,))

rpython/jit/backend/x86/test/test_ztranslation_external_exception.py

 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

rpython/jit/metainterp/gc.py

 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
 

rpython/jit/metainterp/test/test_warmspot.py

         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