Export finalizer-related symbols in Dart FFI (#1150)

Resolves: #1149 Signed-off-by: Daniel Kamkha <[email protected]>
heremaps · Nov 1, 2021 · 41eefea · 41eefea
1 parent fc9fb5d
commit 41eefea
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Gluecodium project Release Notes
 
+## Unreleased
+### Bug fixes:
+  * Fixed linking issues in Dart when building it with Xcode.
+
 ## 10.2.0
 Release date: 2021-10-29
 ### Features:

diff --git a/gluecodium/src/main/resources/templates/ffi/FfiFinalizerDataHeader.mustache b/gluecodium/src/main/resources/templates/ffi/FfiFinalizerDataHeader.mustache
@@ -35,7 +35,7 @@ struct FinalizerData {
     void (*finalizer)(FfiOpaqueHandle, int32_t);
 };
 
-void {{libraryName}}_execute_finalizer(void*, void* data);
+_GLUECODIUM_FFI_EXPORT void {{libraryName}}_execute_finalizer(void*, void* data);
 
 #ifdef __cplusplus
 }

diff --git a/gluecodium/src/main/resources/templates/ffi/FfiInstanceCacheHeader.mustache b/gluecodium/src/main/resources/templates/ffi/FfiInstanceCacheHeader.mustache
@@ -31,8 +31,8 @@ extern "C" {
 
 _GLUECODIUM_FFI_EXPORT Dart_Handle {{libraryName}}_get_cached_dart_handle(FfiOpaqueHandle handle, Dart_Handle null_handle);
 _GLUECODIUM_FFI_EXPORT void {{libraryName}}_cache_dart_handle(FfiOpaqueHandle handle, int32_t isolate_id, Dart_Handle dart_handle);
-void {{libraryName}}_cache_dart_handle_by_raw_pointer(void* raw_pointer, int32_t isolate_id, Dart_Handle dart_handle);
-void {{libraryName}}_uncache_dart_handle_by_raw_pointer(void* raw_pointer, int32_t isolate_id);
+_GLUECODIUM_FFI_EXPORT void {{libraryName}}_cache_dart_handle_by_raw_pointer(void* raw_pointer, int32_t isolate_id, Dart_Handle dart_handle);
+_GLUECODIUM_FFI_EXPORT void {{libraryName}}_uncache_dart_handle_by_raw_pointer(void* raw_pointer, int32_t isolate_id);
 
 #ifdef __cplusplus
 }

diff --git a/gluecodium/src/test/resources/smoke/equatable/output/dart/ffi/FinalizerData.h b/gluecodium/src/test/resources/smoke/equatable/output/dart/ffi/FinalizerData.h
@@ -0,0 +1,15 @@
+#pragma once
+#include "OpaqueHandle.h"
+#include "dart_api_dl.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+struct FinalizerData {
+    FfiOpaqueHandle ffi_handle;
+    int32_t isolate_id;
+    void (*finalizer)(FfiOpaqueHandle, int32_t);
+};
+_GLUECODIUM_FFI_EXPORT void library_execute_finalizer(void*, void* data);
+#ifdef __cplusplus
+}
+#endif
diff --git a/gluecodium/src/test/resources/smoke/equatable/output/dart/ffi/InstanceCache.h b/gluecodium/src/test/resources/smoke/equatable/output/dart/ffi/InstanceCache.h
@@ -6,8 +6,8 @@ extern "C" {
 #endif
 _GLUECODIUM_FFI_EXPORT Dart_Handle library_get_cached_dart_handle(FfiOpaqueHandle handle, Dart_Handle null_handle);
 _GLUECODIUM_FFI_EXPORT void library_cache_dart_handle(FfiOpaqueHandle handle, int32_t isolate_id, Dart_Handle dart_handle);
-void library_cache_dart_handle_by_raw_pointer(void* raw_pointer, int32_t isolate_id, Dart_Handle dart_handle);
-void library_uncache_dart_handle_by_raw_pointer(void* raw_pointer, int32_t isolate_id);
+_GLUECODIUM_FFI_EXPORT void library_cache_dart_handle_by_raw_pointer(void* raw_pointer, int32_t isolate_id, Dart_Handle dart_handle);
+_GLUECODIUM_FFI_EXPORT void library_uncache_dart_handle_by_raw_pointer(void* raw_pointer, int32_t isolate_id);
 #ifdef __cplusplus
 }
 #endif