Workaround a bug in LLVM? Emscripten? that causes it to generate terrible code when registering class methods and properties.

1 files changed, 3 insertions, 4 deletions

diff --git a/system/include/emscripten/bind.h b/system/include/emscripten/bind.h
index 715a9713..3c5a8266 100644
--- a/system/include/emscripten/bind.h
+++ b/system/include/emscripten/bind.h
@@ -417,11 +417,10 @@ namespace emscripten {
 
         // TODO: This could do a reinterpret-cast if sizeof(T) === sizeof(void*)
         template<typename T>
-        inline void* getContext(const T& t) {
+        inline T* getContext(const T& t) {
             // not a leak because this is called once per binding
-            void* p = malloc(sizeof(T));
-            assert(p);
-            memcpy(p, &t, sizeof(T));
+            T* p = reinterpret_cast<T*>(malloc(sizeof(T)));
+            new(p) T(t);
             return p;
         }