[k2] fix constant initialization accessing RuntimeContext

Author: apolyakov

runtime-light/core/kphp-core-impl/kphp-core-context.cpp

@@ -3,13 +3,27 @@
 // Distributed under the GPL v3 License, see LICENSE.notice.txt
 
 #include "runtime-common/core/runtime-core.h"
+#include "runtime-light/k2-platform/k2-api.h"
 #include "runtime-light/state/instance-state.h"
+#include "runtime-light/stdlib/diagnostics/logs.h"
+
+namespace {
 
 constexpr string_size_type initial_minimum_string_buffer_length = 1024;
 constexpr string_size_type initial_maximum_string_buffer_length = (1 << 24);
 
+} // namespace
+
+// FIXME codegen for constants initialization should not access RuntimeContext by mutable reference
 RuntimeContext& RuntimeContext::get() noexcept {
-  return InstanceState::get().runtime_context;
+  if (auto* instance_state_ptr{k2::instance_state()}; instance_state_ptr != nullptr) [[likely]] {
+    return instance_state_ptr->runtime_context;
+  } else if (const auto* component_state_ptr{k2::component_state()}; component_state_ptr != nullptr) [[unlikely]] {
+    kphp::log::error("unexpected access to RuntimeContext");
+  } else if (const auto* image_state_ptr{k2::image_state()}; image_state_ptr != nullptr) [[likely]] {
+    return const_cast<RuntimeContext&>(image_state_ptr->runtime_context);
+  }
+  kphp::log::error("can't find suitable RuntimeContext");
 }
 
 void RuntimeContext::init() noexcept {

runtime-light/state/image-state.h

@@ -28,6 +28,7 @@
 
 struct ImageState final : private vk::not_copyable {
   AllocatorState image_allocator_state{INIT_IMAGE_ALLOCATOR_SIZE, 0};
+  RuntimeContext runtime_context;
 
   uint32_t pid{k2::getpid()};
   uid_t uid{k2::getuid()};
@@ -48,6 +49,8 @@ struct ImageState final : private vk::not_copyable {
   RpcImageState rpc_image_state;
 
   ImageState() noexcept {
+    runtime_context.init();
+
     if (const int64_t sysconf_max_buffer_size{k2::sysconf(_SC_GETPW_R_SIZE_MAX)}; sysconf_max_buffer_size != -1) {
       passwd_max_buffer_size.emplace(sysconf_max_buffer_size);
     }

runtime-light/state/instance-state.cpp

@@ -59,7 +59,6 @@ consteval std::string_view resolve_sapi_name() noexcept {
 // === initialization =============================================================================
 
 void InstanceState::init_script_execution() noexcept {
-  runtime_context.init();
   kphp::coro::task<> script_task;
   init_php_scripts_in_each_worker(php_script_mutable_globals_singleton, script_task);
 

runtime-light/state/instance-state.h

@@ -67,6 +67,7 @@ struct InstanceState final : vk::not_copyable {
   // In the second case clang++ zeroes the whole structure.
   // It drastically ruins performance. Be careful!
   InstanceState() noexcept {
+    runtime_context.init();
     kml_instance_state.init(ComponentState::get().kml_component_state.max_buffer_size());
   }
 
@@ -89,16 +90,17 @@ struct InstanceState final : vk::not_copyable {
   }
 
   AllocatorState instance_allocator_state{INIT_INSTANCE_ALLOCATOR_SIZE, 0};
-  kphp::log::contextual_tags instance_tags;
 
+  kphp::log::contextual_tags instance_tags;
   kphp::coro::io_scheduler io_scheduler;
+
+  RuntimeContext runtime_context;
   CoroutineInstanceState coroutine_instance_state;
   ForkInstanceState fork_instance_state;
   WaitQueueInstanceState wait_queue_instance_state;
   RpcQueueInstanceState rpc_queue_instance_state;
   PhpScriptMutableGlobals php_script_mutable_globals_singleton;
 
-  RuntimeContext runtime_context;
   CLIInstanceInstance cli_instance_instate;
   OutputInstanceState output_instance_state;
   RpcClientInstanceState rpc_client_instance_state;

tests/phpt/pk/021_minmax.php

@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 var_dump(min([1]));