From 24e374ef4ff8650bcb73be021c8cf0c3b0dd3b28 Mon Sep 17 00:00:00 2001
From: Vsevolod Pukhov <pukhov.vsevolod1@huawei.com>
Date: Fri, 26 Apr 2024 19:35:37 +0300
Subject: [PATCH] Update ITable/VTable builders according to core runtime
 changes

Signed-off-by: Vsevolod Pukhov <pukhov.vsevolod1@huawei.com>
---
 runtime/ecma_language_context.cpp | 9 +++++----
 runtime/ecma_language_context.h   | 7 ++++---
 runtime/napi/jsnapi.cpp           | 8 ++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/runtime/ecma_language_context.cpp b/runtime/ecma_language_context.cpp
index 3a6841137..983db405c 100644
--- a/runtime/ecma_language_context.cpp
+++ b/runtime/ecma_language_context.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2024 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -88,14 +88,15 @@ void EcmaLanguageContext::ThrowStackOverflowException(ManagedThread *thread) con
                                "Maximum call stack size exceeded");
 }
 
-PandaUniquePtr<ITableBuilder> EcmaLanguageContext::CreateITableBuilder() const
+PandaUniquePtr<ITableBuilder> EcmaLanguageContext::CreateITableBuilder(
+    [[maybe_unused]] ClassLinkerErrorHandler *errHandler) const
 {
     return MakePandaUnique<CoreITableBuilder>();
 }
 
-PandaUniquePtr<VTableBuilder> EcmaLanguageContext::CreateVTableBuilder() const
+PandaUniquePtr<VTableBuilder> EcmaLanguageContext::CreateVTableBuilder(ClassLinkerErrorHandler *errHandler) const
 {
-    return MakePandaUnique<CoreVTableBuilder>();
+    return MakePandaUnique<CoreVTableBuilder>(errHandler);
 }
 
 size_t EcmaLanguageContext::GetStringSize(const ObjectHeader *stringObject) const
diff --git a/runtime/ecma_language_context.h b/runtime/ecma_language_context.h
index 64790b468..d6dbbf27a 100644
--- a/runtime/ecma_language_context.h
+++ b/runtime/ecma_language_context.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2024 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -276,9 +276,10 @@ public:
         return panda_file::File::READ_WRITE;
     }
 
-    PandaUniquePtr<ITableBuilder> CreateITableBuilder() const override;
+    PandaUniquePtr<ITableBuilder> CreateITableBuilder(
+        [[maybe_unused]] ClassLinkerErrorHandler *errHandler) const override;
 
-    PandaUniquePtr<VTableBuilder> CreateVTableBuilder() const override;
+    PandaUniquePtr<VTableBuilder> CreateVTableBuilder(ClassLinkerErrorHandler *errHandler) const override;
 
     bool InitializeClass(ClassLinker *classLinker, ManagedThread *thread, Class *klass) const override
     {
diff --git a/runtime/napi/jsnapi.cpp b/runtime/napi/jsnapi.cpp
index 3714477dc..a84f311a8 100644
--- a/runtime/napi/jsnapi.cpp
+++ b/runtime/napi/jsnapi.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2024 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -100,9 +100,9 @@ template <typename T>
 using JSHandle = ecmascript::JSHandle<T>;
 
 namespace {
-constexpr uint32_t INTERNAL_POOL_SIZE = 0;
-constexpr uint32_t CODE_POOL_SIZE = 2000000;
-constexpr uint32_t COMPILER_POOL_SIZE = 2000000;
+constexpr uint32_t INTERNAL_POOL_SIZE = 2_MB;
+constexpr uint32_t CODE_POOL_SIZE = 2_MB;
+constexpr uint32_t COMPILER_POOL_SIZE = 2_MB;
 // NOLINTNEXTLINE(fuchsia-statically-constructed-objects)
 constexpr std::string_view ENTRY_POINTER = "_GLOBAL::func_main_0";
 
-- 
Gitee