Skip to content

[k2] fix constant initialization accessing RuntimeContext #1576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apolyakov merged 3 commits into from
Mar 28, 2026
+10 −1
Merged

[k2] fix constant initialization accessing RuntimeContext #1576

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5107ce5
[k2] fix constant initialization accessing RuntimeContext
apolyakov Mar 26, 2026
2b72d96
Revert "[k2] fix constant initialization accessing RuntimeContext"
apolyakov Mar 27, 2026
0090793
make RuntimeContext explicitly unavailable until InstanceState is ini…
apolyakov Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion runtime-light/core/kphp-core-impl/kphp-core-context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,22 @@
// 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

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;
}
kphp::log::error("unexpected access to RuntimeContext");
}

void RuntimeContext::init() noexcept {
Expand Down
Loading