fix static/dynamic nature of get_hash and get_class methods

VKCOM · Feb 25, 2025 · 4f4235e · 4f4235e
1 parent a6fed18
commit 4f4235e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/runtime/job-workers/job-interface.h b/runtime/job-workers/job-interface.h
@@ -83,8 +83,8 @@ struct C$KphpJobWorkerResponseError: public refcountable_polymorphic_php_classes
     return R"(KphpJobWorkerResponseError)";
   }
 
-  int get_hash() const noexcept override {
-    std::string_view name_view{C$KphpJobWorkerResponseError::get_class()};
+  int32_t get_hash() const noexcept override {
+    std::string_view name_view{get_class()};
     return static_cast<int32_t>(vk::murmur_hash<uint32_t>(name_view.data(), name_view.size()));
   }
 

diff --git a/runtime/memcache.h b/runtime/memcache.h
@@ -51,12 +51,12 @@ class C$McMemcache final : public refcountable_polymorphic_php_classes<C$Memcach
     visitor("", array<int64_t>{});
   }
 
-  const char *get_class() const final {
+  const char *get_class() const override {
     return "McMemcache";
   }
 
-  int32_t get_hash() const final {
-    std::string_view name_view{C$McMemcache::get_class()};
+  int32_t get_hash() const override {
+    std::string_view name_view{get_class()};
     return static_cast<int32_t>(vk::murmur_hash<uint32_t>(name_view.data(), name_view.size()));
   }
 

diff --git a/runtime/spl/array_iterator.h b/runtime/spl/array_iterator.h
@@ -13,18 +13,18 @@
 #include "runtime-common/stdlib/visitors/dummy-visitor-methods.h"
 
 // C$ArrayIterator implements SPL ArrayIterator class.
-struct C$ArrayIterator : public refcountable_php_classes<C$ArrayIterator>, private DummyVisitorMethods {
+struct C$ArrayIterator final : public refcountable_php_classes<C$ArrayIterator>, private DummyVisitorMethods {
   // we store an array to keep a living reference to it while iterator is valid;
   // also we may implement rewind() method later if we feel like it
   array<mixed> arr;
   array<mixed>::const_iterator it;
   array<mixed>::const_iterator end;
 
-  const char *get_class() const noexcept {
+  constexpr const char *get_class() const noexcept {
     return "ArrayIterator";
   }
 
-  int32_t get_hash() const noexcept {
+  constexpr int32_t get_hash() const noexcept {
     std::string_view name_view{get_class()};
     return static_cast<int32_t>(vk::murmur_hash<uint32_t>(name_view.data(), name_view.size()));
   }

diff --git a/runtime/tl/rpc_function.h b/runtime/tl/rpc_function.h
@@ -9,8 +9,8 @@
 #include <string_view>
 
 #include "common/algorithms/hashes.h"
-#include "common/wrappers/string_view.h"
 #include "runtime-common/core/class-instance/refcountable-php-classes.h"
+#include "runtime-common/core/runtime-core.h"
 
 struct tl_func_base;
 
@@ -28,7 +28,7 @@ class InstanceDeepDestroyVisitor;
 struct C$VK$TL$RpcFunction : abstract_refcountable_php_interface {
   virtual const char *get_class() const { return "VK\\TL\\RpcFunction"; }
   virtual int32_t get_hash() const {
-    std::string_view name_view{C$VK$TL$RpcFunction::get_class()};
+    std::string_view name_view{get_class()};
     return static_cast<int32_t>(vk::murmur_hash<uint32_t>(name_view.data(), name_view.size()));
   }
 
@@ -50,7 +50,7 @@ struct C$VK$TL$RpcFunction : abstract_refcountable_php_interface {
 struct C$VK$TL$RpcFunctionReturnResult : abstract_refcountable_php_interface {
   virtual const char *get_class() const { return "VK\\TL\\RpcFunctionReturnResult"; }
   virtual int32_t get_hash() const {
-    std::string_view name_view{C$VK$TL$RpcFunctionReturnResult::get_class()};
+    std::string_view name_view{get_class()};
     return static_cast<int32_t>(vk::murmur_hash<uint32_t>(name_view.data(), name_view.size()));
   }
 
@@ -79,7 +79,7 @@ struct C$VK$TL$RpcResponse : abstract_refcountable_php_interface {
 
   virtual const char *get_class() const { return "VK\\TL\\RpcResponse"; }
   virtual int32_t get_hash() const {
-    std::string_view name_view{C$VK$TL$RpcResponse::get_class()};
+    std::string_view name_view{get_class()};
     return static_cast<int32_t>(vk::murmur_hash<uint32_t>(name_view.data(), name_view.size()));
   }