@idlizer/arktscgen 2.1.5 → 2.1.7

package/build/libarkts-copy/native/meson.build

@@ -1,3 +1,16 @@
+# Copyright (c) 2025 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 project(
     'es2panda_interop',
     'cpp',

package/build/libarkts-copy/native/meson_options.txt

@@ -1,3 +1,16 @@
+# Copyright (c) 2025 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 option(
     'node_modules_dir',
     type : 'string',

package/build/libarkts-copy/native/src/bridges.cc

@@ -39,7 +39,7 @@ KNativePointer impl_AnnotationAllowedAnnotations(KNativePointer contextPtr, KNat
     auto node = reinterpret_cast<es2panda_AstNode*>(nodePtr);
     std::size_t params_len = 0;
     auto annotations = GetImpl()->AnnotationAllowedAnnotations(context, node, &params_len);
-    return new std::vector<void*>(annotations, annotations + params_len);
+    return StageArena::cloneVector(annotations, params_len);
 }
 KOALA_INTEROP_3(AnnotationAllowedAnnotations, KNativePointer, KNativePointer, KNativePointer, KNativePointer)
 
@@ -49,7 +49,7 @@ KNativePointer impl_AnnotationAllowedAnnotationsConst(KNativePointer contextPtr,
     auto node = reinterpret_cast<es2panda_AstNode*>(nodePtr);
     std::size_t params_len = 0;
     auto annotations = GetImpl()->AnnotationAllowedAnnotationsConst(context, node, &params_len);
-    return new std::vector<void*>(annotations, annotations + params_len);
+    return StageArena::cloneVector(annotations, params_len);
 }
 KOALA_INTEROP_3(AnnotationAllowedAnnotationsConst, KNativePointer, KNativePointer, KNativePointer, KNativePointer)
 
@@ -151,7 +151,7 @@ KOALA_INTEROP_1(ContextProgram, KNativePointer, KNativePointer)
 
 KNativePointer impl_ProgramAst(KNativePointer contextPtr, KNativePointer programPtr)
 {
-    auto context = reinterpret_cast<es2panda_Context*>(programPtr);
+    auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
     auto program = reinterpret_cast<es2panda_Program*>(programPtr);
     return GetImpl()->ProgramAst(context, program);
 }
@@ -190,7 +190,7 @@ KNativePointer impl_ContextErrorMessage(KNativePointer contextPtr)
 {
     auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
 
-    return new string(GetImpl()->ContextErrorMessage(context));
+    return StageArena::strdup(GetImpl()->ContextErrorMessage(context));
 }
 KOALA_INTEROP_1(ContextErrorMessage, KNativePointer, KNativePointer)
 
@@ -228,15 +228,15 @@ static KNativePointer impl_ProgramExternalSources(KNativePointer contextPtr, KNa
     auto&& instance = reinterpret_cast<es2panda_Program *>(instancePtr);
     std::size_t source_len = 0;
     auto external_sources = GetImpl()->ProgramExternalSources(context, instance, &source_len);
-    return new std::vector<void*>(external_sources, external_sources + source_len);
+    return StageArena::cloneVector(external_sources, source_len);
 }
 KOALA_INTEROP_2(ProgramExternalSources, KNativePointer, KNativePointer, KNativePointer);
 
 static KNativePointer impl_ExternalSourceName(KNativePointer instance)
 {
     auto&& _instance_ = reinterpret_cast<es2panda_ExternalSource *>(instance);
-    auto&& _result_ = GetImpl()->ExternalSourceName(_instance_);
-    return new std::string(_result_);
+    auto&& result = GetImpl()->ExternalSourceName(_instance_);
+    return StageArena::strdup(result);
 }
 KOALA_INTEROP_1(ExternalSourceName, KNativePointer, KNativePointer);
 
@@ -245,7 +245,7 @@ static KNativePointer impl_ExternalSourcePrograms(KNativePointer instance)
     auto&& _instance_ = reinterpret_cast<es2panda_ExternalSource *>(instance);
     std::size_t program_len = 0;
     auto programs = GetImpl()->ExternalSourcePrograms(_instance_, &program_len);
-    return new std::vector<void*>(programs, programs + program_len);
+    return StageArena::cloneVector(programs, program_len);
 }
 KOALA_INTEROP_1(ExternalSourcePrograms, KNativePointer, KNativePointer);
 

package/build/libarkts-copy/native/src/common.cc

@@ -14,11 +14,56 @@
  */
 
 #include <common.h>
+#include <utility>
 
 using std::string, std::cout, std::endl, std::vector;
 
 static es2panda_Impl *impl = nullptr;
 
+static thread_local StageArena currentArena;
+
+StageArena* StageArena::instance() {
+    return &currentArena;
+}
+
+void StageArena::add(void* pointer) {
+    if (pointer)
+        allocated.push_back(pointer);
+}
+
+void StageArena::cleanup() {
+    if (totalSize > 0 && false)
+        printf("cleanup %d objects %d bytes\n", (int)allocated.size(), (int)totalSize);
+    for (auto it : allocated) {
+        free(it);
+    }
+    totalSize = 0;
+    allocated.clear();
+}
+
+StageArena::StageArena() {
+    totalSize = 0;
+}
+
+StageArena::~StageArena() {
+    cleanup();
+}
+
+char* StageArena::strdup(const char* string) {
+    auto* arena = StageArena::instance();
+    auto size = strlen(string) + 1;
+    char* memory = (char*)arena->alloc(size);
+    memcpy(memory, string, size);
+    return memory;
+}
+
+void* StageArena::alloc(size_t size) {
+    void* result = malloc(size);
+    totalSize += size;
+    add(result);
+    return result;
+}
+
 #ifdef KOALA_WINDOWS
     #include <windows.h>
     #define PLUGIN_DIR "windows_host_tools"
@@ -58,11 +103,13 @@ es2panda_Impl *GetImpl() {
     }
     auto library = FindLibrary();
     if (!library) {
-        throw std::runtime_error("No library (es2panda_lib.cc)");
+        printf("No library (es2panda_lib.cc)"); // TODO: dont use throw for ohos build
+        abort();
     }
     auto symbol = findSymbol(library, "es2panda_GetImpl");
     if (!symbol) {
-        throw std::runtime_error("No entry point");
+        printf("no entry point");
+        abort();
     }
     impl = reinterpret_cast<es2panda_Impl *(*)(int)>(symbol)(ES2PANDA_LIB_VERSION);
     return impl;
@@ -78,7 +125,7 @@ string getString(KStringPtr ptr) {
 }
 
 char* getStringCopy(KStringPtr& ptr) {
-    return strdup(ptr.c_str());
+    return StageArena::strdup(ptr.c_str() ? ptr.c_str() : "");
 }
 
 inline KUInt unpackUInt(const KByte* bytes) {
@@ -91,7 +138,7 @@ inline KUInt unpackUInt(const KByte* bytes) {
     const KUInt BYTE_2_SHIFT = 16;
     const KUInt BYTE_3_SHIFT = 24;
     return (
-        bytes[BYTE_0] 
+        bytes[BYTE_0]
         | (bytes[BYTE_1] << BYTE_1_SHIFT)
         | (bytes[BYTE_2] << BYTE_2_SHIFT)
         | (bytes[BYTE_3] << BYTE_3_SHIFT)
@@ -101,13 +148,13 @@ inline KUInt unpackUInt(const KByte* bytes) {
 KNativePointer impl_CreateConfig(KInt argc, KStringArray argvPtr) {
     const std::size_t headerLen = 4;
 
-    const char** argv = new const char*[argc];
+    const char** argv = StageArena::allocArray<const char*>(argc);
     std::size_t position = headerLen;
     std::size_t strLen;
     for (std::size_t i = 0; i < static_cast<std::size_t>(argc); ++i) {
         strLen = unpackUInt(argvPtr + position);
         position += headerLen;
-        argv[i] = strdup(std::string(reinterpret_cast<const char*>(argvPtr + position), strLen).c_str());
+        argv[i] = StageArena::strdup(std::string(reinterpret_cast<const char*>(argvPtr + position), strLen).c_str());
         position += strLen;
     }
     return GetImpl()->CreateConfig(argc, argv);
@@ -124,6 +171,7 @@ KOALA_INTEROP_1(DestroyConfig, KNativePointer, KNativePointer)
 KNativePointer impl_DestroyContext(KNativePointer contextPtr) {
     auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
     GetImpl()->DestroyContext(context);
+    StageArena::instance()->cleanup();
     return nullptr;
 }
 KOALA_INTEROP_1(DestroyContext, KNativePointer, KNativePointer)
@@ -148,7 +196,7 @@ KNativePointer impl_UpdateCallExpression(
 
     auto nn = GetImpl()->CreateCallExpression(
         context, callee, arguments, argumentsLen, typeParams, optional, trailingComma
-    ); 
+    );
     GetImpl()->AstNodeSetOriginalNode(context, nn, node);
     return nn;
 }
@@ -222,7 +270,7 @@ KNativePointer impl_AstNodeChildren(
     cachedChildren.clear();
 
     GetImpl()->AstNodeIterateConst(context, node, visitChild);
-    return new std::vector(cachedChildren);
+    return StageArena::clone(cachedChildren);
 }
 KOALA_INTEROP_2(AstNodeChildren, KNativePointer, KNativePointer, KNativePointer)
 

package/build/libarkts-copy/native/src/common.h

@@ -36,4 +36,52 @@ inline KUInt unpackUInt(const KByte* bytes);
 
 es2panda_ContextState intToState(KInt state);
 
+class StageArena {
+    std::vector<void*> allocated;
+    size_t totalSize;
+  public:
+    StageArena();
+    ~StageArena();
+    static StageArena* instance();
+    template <typename T>
+    static T* alloc() {
+        auto* arena = StageArena::instance();
+        void* memory = arena->alloc(sizeof(T));
+        return new (memory) T();
+    }
+    template <class T, class T1>
+    static T* alloc(T1 arg1) {
+        auto* arena = StageArena::instance();
+        void* memory = arena->alloc(sizeof(T));
+        return new (memory) T(std::forward(arg1));
+    }
+    template <class T, class T1, class T2>
+    static T* alloc(T1 arg1, T2 arg2) {
+        auto* arena = StageArena::instance();
+        void* memory = arena->alloc(sizeof(T));
+        return new (memory) T(arg1, arg2);
+    }
+    template <typename T>
+    static T* allocArray(size_t count) {
+        auto* arena = StageArena::instance();
+        // align?
+        void* memory = arena->alloc(sizeof(T) * count);
+        return new (memory) T();
+    }
+    template <class T>
+    static T* clone(const T& arg) {
+        auto* arena = StageArena::instance();
+        void* memory = arena->alloc(sizeof(T));
+        return new (memory) T(arg);
+    }
+    template <class T>
+    static std::vector<const void*>* cloneVector(const T* arg, size_t count) {
+        return alloc<std::vector<const void*>, const T*, const T*>(arg, arg + count);
+    }
+    void* alloc(size_t size);
+    static char* strdup(const char* original);
+    void add(void* pointer);
+    void cleanup();
+};
+
 #endif // COMMON_H