Merge branch 'master' into gc-std-atomic

Author: Aidan Lee

.github/workflows/test.yml

@@ -196,10 +196,30 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
+      - name: setup
+        uses: ./.github/workflows/setup
+        with:
+          haxe: ${{ inputs.haxe }}
+      - name: Get Haxe commit SHA
+        if: inputs.haxe == 'latest'
+        id: haxe_sha
+        shell: bash
+        working-directory:
+          ${{github.workspace}}
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          version=$(haxe --version)
+          short_sha=${version##*+}
+          full_sha=$(gh api repos/HaxeFoundation/haxe/commits/$short_sha --jq '.sha')
+          echo "Haxe version: $version"
+          echo "sha=$full_sha" >> "$GITHUB_OUTPUT"
+          echo "Commit SHA: $short_sha, Full SHA: $full_sha"
       - name: checkout haxe (latest)
         if: inputs.haxe == 'latest'
         uses: actions/checkout@v4
         with:
+          ref: ${{ steps.haxe_sha.outputs.sha }}
           repository: HaxeFoundation/haxe
           path: haxe
       - name: checkout haxe (stable)
@@ -209,10 +229,6 @@ jobs:
           repository: HaxeFoundation/haxe
           path: haxe
           ref: ${{ inputs.haxe }}
-      - name: setup
-        uses: ./.github/workflows/setup
-        with:
-          haxe: ${{ inputs.haxe }}
       - name: install haxe libs
         run: haxelib install compile-cpp.hxml --always
         # haxe 4 tests don't build with latest utest

include/cpp/Pointer.h

@@ -503,7 +503,7 @@ class Pointer_obj
    }
 
    template<typename T>
-	inline static AutoCast ofArray(::Array<T> array)  { return AutoCast(&array[0]); }
+	inline static AutoCast ofArray(::Array<T> array)  { return AutoCast(array->Pointer()); }
 	inline static AutoCast ofArray(Dynamic inVal)
    {
       if (inVal==null() || !inVal->__IsArray())

include/cpp/encoding/Utf16.hpp

@@ -9,15 +9,15 @@ namespace cpp
             static bool isEncoded(const String& string);
 
             static int getByteCount(const null&);
-            static int getByteCount(const char32_t& codepoint);
+            static int getByteCount(char32_t codepoint);
             static int64_t getByteCount(const String& string);
 
             static int getCharCount(const null&);
-            static int getCharCount(const char32_t& codepoint);
+            static int getCharCount(char32_t codepoint);
             static int64_t getCharCount(const String& string);
 
             static int encode(const null&, const cpp::marshal::View<uint8_t>& buffer);
-            static int encode(const char32_t& codepoint, const cpp::marshal::View<uint8_t>& buffer);
+            static int encode(char32_t codepoint, const cpp::marshal::View<uint8_t>& buffer);
             static int64_t encode(const String& string, const cpp::marshal::View<uint8_t>& buffer);
 
             static char32_t codepoint(const cpp::marshal::View<uint8_t>& buffer);

include/cpp/encoding/Utf8.hpp

@@ -7,16 +7,17 @@ namespace cpp
         struct Utf8 final
         {
             static int getByteCount(const null&);
-            static int getByteCount(const char32_t& codepoint);
+            static int getByteCount(char32_t codepoint);
             static int64_t getByteCount(const String& string);
 
             static int getCharCount(const null&);
-            static int getCharCount(const char32_t& codepoint);
+            static int getCharCount(char32_t codepoint);
             static int64_t getCharCount(const String& string);
 
             static int encode(const null&, const cpp::marshal::View<uint8_t>& buffer);
-            static int encode(const char32_t& codepoint, const cpp::marshal::View<uint8_t>& buffer);
+            static int encode(char32_t codepoint, const cpp::marshal::View<uint8_t>& buffer);
             static int64_t encode(const String& string, const cpp::marshal::View<uint8_t>& buffer);
+            static Array<uint8_t> encode(const String& string);
 
             static char32_t codepoint(const cpp::marshal::View<uint8_t>& buffer);
             static String decode(const cpp::marshal::View<uint8_t>& buffer);

include/hx/StdLibs.h

@@ -299,15 +299,14 @@ double __hxcpp_time_stamp();
 
 // --- vm/threading --------------------------------------------------------------------
 
-#if (HXCPP_API_LEVEL>=500)
-Dynamic __hxcpp_thread_create(hx::Callable<void()> inFunc);
-#else
+#if (HXCPP_API_LEVEL<500)
+
 Dynamic __hxcpp_thread_create(Dynamic inFunc);
-#endif
+
 Dynamic __hxcpp_thread_current();
 void    __hxcpp_thread_send(Dynamic inThread, Dynamic inMessage);
 Dynamic __hxcpp_thread_read_message(bool inBlocked);
-bool __hxcpp_is_current_thread(hx::Object *inThread);
+bool __hxcpp_is_current_thread(hx::Object* inThread);
 
 Dynamic __hxcpp_mutex_create();
 void    __hxcpp_mutex_acquire(Dynamic);
@@ -324,21 +323,23 @@ void __hxcpp_condition_acquire(Dynamic);
 bool __hxcpp_condition_try_acquire(Dynamic);
 void __hxcpp_condition_release(Dynamic);
 void __hxcpp_condition_wait(Dynamic);
-bool __hxcpp_condition_timed_wait(Dynamic,double);
+bool __hxcpp_condition_timed_wait(Dynamic, double);
 void __hxcpp_condition_signal(Dynamic);
 void __hxcpp_condition_broadcast(Dynamic);
 
 Dynamic __hxcpp_lock_create();
-bool    __hxcpp_lock_wait(Dynamic inlock,double inTime);
+bool    __hxcpp_lock_wait(Dynamic inlock, double inTime);
 void    __hxcpp_lock_release(Dynamic inlock);
 
 Dynamic __hxcpp_deque_create();
-void    __hxcpp_deque_add(Dynamic q,Dynamic inVal);
-void    __hxcpp_deque_push(Dynamic q,Dynamic inVal);
-Dynamic __hxcpp_deque_pop(Dynamic q,bool block);
+void    __hxcpp_deque_add(Dynamic q, Dynamic inVal);
+void    __hxcpp_deque_push(Dynamic q, Dynamic inVal);
+Dynamic __hxcpp_deque_pop(Dynamic q, bool block);
 
 Dynamic __hxcpp_tls_get(int inID);
-void    __hxcpp_tls_set(int inID,Dynamic inVal);
+void    __hxcpp_tls_set(int inID, Dynamic inVal);
+
+#endif
 
 bool _hx_atomic_exchange_if(::cpp::Pointer<cpp::AtomicInt> inPtr, int test, int newVal  );
 int _hx_atomic_inc(::cpp::Pointer<cpp::AtomicInt> inPtr );

include/hx/TelemetryTracy.h

@@ -7,8 +7,8 @@
 
 #define TRACY_ENABLE
 #include <hxcpp.h>
-#include "../../project/thirdparty/tracy-0.12.0/tracy/TracyC.h"
-#include "../../project/thirdparty/tracy-0.12.0/tracy/Tracy.hpp"
+#include "../../project/thirdparty/tracy-0.13.1/tracy/TracyC.h"
+#include "../../project/thirdparty/tracy-0.13.1/tracy/Tracy.hpp"
 
 #ifdef HXCPP_TRACY_MEMORY
 	#ifdef HXCPP_GC_MOVING

include/hx/thread/Thread.hpp

@@ -25,13 +25,6 @@ namespace hx
 
 			virtual String getName() = 0;
 			virtual void setName(const String& name) = 0;
-
-			virtual String toString() override = 0;
-
-			virtual void __Mark(HX_MARK_PARAMS) override = 0;
-#ifdef HXCPP_VISIT_ALLOCS
-			virtual void __Visit(HX_VISIT_PARAMS) override = 0;
-#endif
 		};
 	}
 }

project/thirdparty/tracy-0.12.0/README.md project/thirdparty/tracy-0.13.1/README.mdproject/thirdparty/tracy-0.12.0/README.md renamed to project/thirdparty/tracy-0.13.1/README.md

@@ -32,27 +32,11 @@
 #include "client/TracyOverride.cpp"
 #include "client/TracyKCore.cpp"
 
-#if defined(TRACY_HAS_CALLSTACK)
-#  if TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3 || TRACY_HAS_CALLSTACK == 4 || TRACY_HAS_CALLSTACK == 6
-#    include "libbacktrace/alloc.cpp"
-#    include "libbacktrace/dwarf.cpp"
-#    include "libbacktrace/fileline.cpp"
-#    include "libbacktrace/mmapio.cpp"
-#    include "libbacktrace/posix.cpp"
-#    include "libbacktrace/sort.cpp"
-#    include "libbacktrace/state.cpp"
-#    if TRACY_HAS_CALLSTACK == 4
-#      include "libbacktrace/macho.cpp"
-#    else
-#      include "libbacktrace/elf.cpp"
-#    endif
-#    include "common/TracyStackFrames.cpp"
-#  endif
+#ifdef TRACY_ROCPROF
+#  include "client/TracyRocprof.cpp"
 #endif
-
 #ifdef _MSC_VER
 #  pragma comment(lib, "ws2_32.lib")
-#  pragma comment(lib, "dbghelp.lib")
 #  pragma comment(lib, "advapi32.lib")
 #  pragma comment(lib, "user32.lib")
 #  pragma warning(pop)