From 9469eb976b46ae507efaaa698c4a99dc44f57d83 Mon Sep 17 00:00:00 2001
From: Eduardo Souza <ledusou@gmail.com>
Date: Wed, 28 Aug 2024 00:44:09 +0000
Subject: [PATCH] Refactoring to be considered before adding MMTk

---
 src/gc-stock.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gc-stock.c b/src/gc-stock.c
index 05f2f5930448c5..5fd3b7efafead2 100644
--- a/src/gc-stock.c
+++ b/src/gc-stock.c
@@ -3892,6 +3892,7 @@ JL_DLLEXPORT size_t jl_gc_external_obj_hdr_size(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 >>>>>>> c48a701f54 (WIP: Adding support for MMTk/Immix)
@@ -3900,6 +3901,8 @@ JL_DLLEXPORT size_t jl_gc_external_obj_hdr_size(void)
 =======
 
 >>>>>>> 30ac6f081d (Fixing removed newlines)
+=======
+>>>>>>> 2efcdf8335 (Refactoring to be considered before adding MMTk)
 JL_DLLEXPORT void jl_gc_schedule_foreign_sweepfunc(jl_ptls_t ptls, jl_value_t *obj)
 {
     arraylist_push(&ptls->gc_tls.sweep_objs, obj);