VM: instead of enqueue_safepoint() just call set_safepoint_guard() directly

diff --git a/vm/safepoints.cpp b/vm/safepoints.cpp
index 3b064f42af5d1ac14a37d5593926f9ac2273f53e..36c40a5c6e7837afebb7104c4d2dfe614ebc4e72 100644 (file)
--- a/vm/safepoints.cpp
+++ b/vm/safepoints.cpp
@@ -2,15 +2,11 @@
 
 namespace factor {
 
-void safepoint_state::enqueue_safepoint(factor_vm* parent) volatile {
-  parent->code->set_safepoint_guard(true);
-}
-
 void safepoint_state::enqueue_fep(factor_vm* parent) volatile {
   if (parent->fep_p)
     fatal_error("Low-level debugger interrupted", 0);
   atomic::store(&fep_p, true);
-  enqueue_safepoint(parent);
+  parent->code->set_safepoint_guard(true);
 }
 
 void safepoint_state::enqueue_samples(factor_vm* parent,
@@ -32,7 +28,7 @@ void safepoint_state::enqueue_samples(factor_vm* parent,
     if (!parent->code->seg->in_segment_p(pc))
       atomic::fetch_add(&sample_counts.foreign_sample_count, samples);
   }
-  enqueue_safepoint(parent);
+  parent->code->set_safepoint_guard(true);
 }
 
 void safepoint_state::handle_safepoint(factor_vm* parent, cell pc) volatile {

diff --git a/vm/safepoints.hpp b/vm/safepoints.hpp
index 458faf6e52b587f167f28b7c45098b05f0de06bd..60be6a8178cd609171eb75d07cb079c637402f52 100644 (file)
--- a/vm/safepoints.hpp
+++ b/vm/safepoints.hpp
@@ -8,7 +8,6 @@ struct safepoint_state {
 
   void handle_safepoint(factor_vm* parent, cell pc) volatile;
 
-  void enqueue_safepoint(factor_vm* parent) volatile;
   void enqueue_samples(factor_vm* parent, cell samples, cell pc,
                        bool foreign_thread_p) volatile;
   void enqueue_fep(factor_vm* parent) volatile;