refactor: remove a layer of indirection when accessing the scopes storage

Author: SuperFola

include/Ark/VM/ScopeView.hpp

@@ -40,7 +40,7 @@ namespace Ark::internal
          * @param storage pointer to the shared scope storage
          * @param start first free starting position
          */
-        ScopeView(std::array<pair_t, ScopeStackSize>* storage, std::size_t start) noexcept;
+        ScopeView(pair_t* storage, std::size_t start) noexcept;
 
         /**
          * @brief Put a value in the scope
@@ -98,7 +98,7 @@ namespace Ark::internal
          */
         [[nodiscard]] inline const pair_t& atPos(const std::size_t i) const noexcept
         {
-            return (*m_storage)[m_start + i];
+            return m_storage[m_start + i];
         }
 
         /**
@@ -126,7 +126,7 @@ namespace Ark::internal
         friend class Ark::VM;
 
     private:
-        std::array<pair_t, ScopeStackSize>* m_storage;
+        pair_t* m_storage;
         std::size_t m_start;
         std::size_t m_size;
         uint16_t m_min_id;  ///< Minimum stored ID, used for a basic bloom filter

include/Ark/VM/VM.inl

@@ -332,7 +332,7 @@ inline void VM::call(internal::ExecutionContext& context, const uint16_t argc)
             const PageAddr_t new_page_pointer = function.pageAddr();
 
             // create dedicated scope
-            context.locals.emplace_back(&context.scopes_storage, context.locals.back().storageEnd());
+            context.locals.emplace_back(context.scopes_storage.data(), context.locals.back().storageEnd());
             swapStackForFunCall(argc, context);
 
             // store "reference" to the function to speed the recursive functions
@@ -351,7 +351,7 @@ inline void VM::call(internal::ExecutionContext& context, const uint16_t argc)
             const PageAddr_t new_page_pointer = c.pageAddr();
 
             // create dedicated scope
-            context.locals.emplace_back(&context.scopes_storage, context.locals.back().storageEnd());
+            context.locals.emplace_back(context.scopes_storage.data(), context.locals.back().storageEnd());
             // load saved scope
             c.refScope().mergeRefInto(context.locals.back());
             context.stacked_closure_scopes.back() = c.scopePtr();

src/arkreactor/VM/ScopeView.cpp

@@ -4,7 +4,7 @@
 
 namespace Ark::internal
 {
-    ScopeView::ScopeView(std::array<pair_t, ScopeStackSize>* storage, const std::size_t start) noexcept :
+    ScopeView::ScopeView(pair_t* storage, const std::size_t start) noexcept :
         m_storage(storage), m_start(start), m_size(0), m_min_id(std::numeric_limits<uint16_t>::max()), m_max_id(0)
     {}
 
@@ -15,7 +15,7 @@ namespace Ark::internal
         if (id > m_max_id)
             m_max_id = id;
 
-        (*m_storage)[m_start + m_size] = std::make_pair(id, std::move(val));
+        m_storage[m_start + m_size] = std::make_pair(id, std::move(val));
         ++m_size;
     }
 
@@ -26,7 +26,7 @@ namespace Ark::internal
         if (id > m_max_id)
             m_max_id = id;
 
-        (*m_storage)[m_start + m_size] = std::make_pair(id, val);
+        m_storage[m_start + m_size] = std::make_pair(id, val);
         ++m_size;
     }
 
@@ -42,7 +42,7 @@ namespace Ark::internal
 
         for (std::size_t i = m_start; i < m_start + m_size; ++i)
         {
-            auto& [id, value] = (*m_storage)[i];
+            auto& [id, value] = m_storage[i];
             if (id == id_to_look_for)
                 return &value;
         }
@@ -56,7 +56,7 @@ namespace Ark::internal
 
         for (std::size_t i = m_start; i < m_start + m_size; ++i)
         {
-            auto& [id, value] = (*m_storage)[i];
+            auto& [id, value] = m_storage[i];
             if (id == id_to_look_for)
                 return &value;
         }
@@ -67,7 +67,7 @@ namespace Ark::internal
     {
         for (std::size_t i = m_start; i < m_start + m_size; ++i)
         {
-            const auto& [id, value] = (*m_storage)[i];
+            const auto& [id, value] = m_storage[i];
             if (value == val)
                 return id;
         }

src/arkreactor/VM/VM.cpp

@@ -103,7 +103,7 @@ namespace Ark
         m_exit_code = 0;
 
         context.locals.clear();
-        context.locals.emplace_back(&context.scopes_storage, 0);
+        context.locals.emplace_back(context.scopes_storage.data(), 0);
 
         // loading bound stuff
         // put them in the global frame if we can, aka the first one
@@ -236,7 +236,7 @@ namespace Ark
         ctx->scopes_storage = m_execution_contexts.front()->scopes_storage;
         for (const auto& local : m_execution_contexts.front()->locals)
         {
-            auto& scope = ctx->locals.emplace_back(&ctx->scopes_storage, local.m_start);
+            auto& scope = ctx->locals.emplace_back(ctx->scopes_storage.data(), local.m_start);
             scope.m_size = local.m_size;
             scope.m_min_id = local.m_min_id;
             scope.m_max_id = local.m_max_id;
@@ -922,7 +922,7 @@ namespace Ark
 
                     TARGET(CREATE_SCOPE)
                     {
-                        context.locals.emplace_back(&context.scopes_storage, context.locals.back().storageEnd());
+                        context.locals.emplace_back(context.scopes_storage.data(), context.locals.back().storageEnd());
                         DISPATCH();
                     }