Disable late-registration errors in Relaxed mode

Differential Revision: D26265450 fbshipit-source-id: 0cefa65feb3fc3b76c1b8b8a9059dc4d321c6751

Disable late-registration errors in Relaxed mode
Differential Revision: D26265450 fbshipit-source-id: 0cefa65feb3fc3b76c1b8b8a9059dc4d321c6751
1ff8690a · Andrii Grynenko · Facebook GitHub Bot · 1ff074e1 · 1ff8690a
Commit 1ff8690a authored Feb 05, 2021 by Andrii Grynenko Committed by Facebook GitHub Bot Feb 05, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

folly/Singleton.cpp folly/Singleton.cpp +2 -2

No files found.
--- a/folly/Singleton.cpp
+++ b/folly/Singleton.cpp
@@ -239,7 +239,7 @@ void SingletonVault::registerSingleton(detail::SingletonHolderBase* entry) {
  auto state = state_.rlock();
  state->check(detail::SingletonVaultState::Type::Running);

-  if (UNLIKELY(state->registrationComplete)) {
+  if (UNLIKELY(state->registrationComplete) && type_ == Type::Strict) {
    LOG(ERROR) << "Registering singleton after registrationComplete().";
  }

@@ -252,7 +252,7 @@ void SingletonVault::addEagerInitSingleton(detail::SingletonHolderBase* entry) {
  auto state = state_.rlock();
  state->check(detail::SingletonVaultState::Type::Running);

-  if (UNLIKELY(state->registrationComplete)) {
+  if (UNLIKELY(state->registrationComplete) && type_ == Type::Strict) {
    LOG(ERROR) << "Registering for eager-load after registrationComplete().";
  }