Revert changes taht are no longer used in the PR

JuliaLang · Sep 24, 2024 · 49df6e9 · 49df6e9
1 parent 5965407
commit 49df6e9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 35 deletions.
diff --git a/src/gc-stock.c b/src/gc-stock.c
@@ -305,9 +305,6 @@ STATIC_INLINE void gc_setmark_pool(jl_ptls_t ptls, jl_taggedvalue_t *o,
 STATIC_INLINE void gc_setmark(jl_ptls_t ptls, jl_taggedvalue_t *o,
  uint8_t mark_mode, size_t sz) JL_NOTSAFEPOINT
 {
- if (o->bits.in_image) {
- return;
- }
  if (sz <= GC_MAX_SZCLASS) {
  gc_setmark_pool(ptls, o, mark_mode);
  }
@@ -4016,36 +4013,6 @@ JL_DLLEXPORT void jl_gc_schedule_foreign_sweepfunc(jl_ptls_t ptls, jl_value_t *o
  arraylist_push(&ptls->gc_tls.sweep_objs, obj);
 }
 
-void jl_gc_force_mark_old(jl_ptls_t ptls, jl_value_t *v) JL_NOTSAFEPOINT
-{
- jl_taggedvalue_t *o = jl_astaggedvalue(v);
- jl_datatype_t *dt = (jl_datatype_t*)jl_typeof(v);
- size_t dtsz = jl_datatype_size(dt);
- if (o->bits.gc == GC_OLD_MARKED)
- return;
- o->bits.gc = GC_OLD_MARKED;
- if (dt == jl_simplevector_type) {
- size_t l = jl_svec_len(v);
- dtsz = l * sizeof(void*) + sizeof(jl_svec_t);
- }
- else if (dt->name == jl_genericmemory_typename) {
- dtsz = sizeof(jl_genericmemory_t);
- }
- else if (dt == jl_module_type) {
- dtsz = sizeof(jl_module_t);
- }
- else if (dt == jl_task_type) {
- dtsz = sizeof(jl_task_t);
- }
- else if (dt == jl_symbol_type) {
- return;
- }
- gc_setmark(ptls, o, GC_OLD_MARKED, dtsz);
- if (dt->layout->npointers != 0)
- jl_gc_queue_root(v);
-}
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/jl_exported_funcs.inc b/src/jl_exported_funcs.inc
@@ -170,7 +170,6 @@
  XX(jl_gc_small_alloc) \
  XX(jl_gc_queue_multiroot) \
  XX(jl_gc_queue_root) \
- XX(jl_gc_force_mark_old) \
  XX(jl_gc_safepoint) \
  XX(jl_gc_schedule_foreign_sweepfunc) \
  XX(jl_gc_set_cb_notify_external_alloc) \

diff --git a/src/julia_internal.h b/src/julia_internal.h
@@ -374,7 +374,6 @@ jl_value_t *jl_gc_small_alloc_noinline(jl_ptls_t ptls, int offset,
  int osize);
 jl_value_t *jl_gc_big_alloc_noinline(jl_ptls_t ptls, size_t allocsz);
 JL_DLLEXPORT int jl_gc_classify_pools(size_t sz, int *osize) JL_NOTSAFEPOINT;
-JL_DLLEXPORT void jl_gc_force_mark_old(jl_ptls_t ptls, jl_value_t *v);
 void gc_sweep_sysimg(void);