feat: try typedef to handle allo-isolate

fzyzcjy · Jan 4, 2024 · 9a3bfa2 · 9a3bfa2
1 parent d6ed831
commit 9a3bfa2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/frb_codegen/src/library/commands/cbindgen.rs b/frb_codegen/src/library/commands/cbindgen.rs
@@ -52,7 +52,10 @@ pub(crate) fn default_cbindgen_config() -> cbindgen::Config {
     cbindgen::Config {
         // copied from: dart-sdk/dart_api.h
         // used to convert Dart_Handle to Object.
-        after_includes: Some("typedef struct _Dart_Handle* Dart_Handle;".to_owned()),
+        after_includes: Some(
+            "typedef struct _Dart_Handle* Dart_Handle;\ntypedef struct Dart_CObject DartCObject;"
+                .to_owned(),
+        ),
         language: cbindgen::Language::C,
         sys_includes: vec![
             "stdbool.h".to_string(),

diff --git a/frb_dart/lib/src/ffigen_generated/intermediate/allo_isolate.h b/frb_dart/lib/src/ffigen_generated/intermediate/allo_isolate.h
@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 typedef struct _Dart_Handle* Dart_Handle;
+typedef struct Dart_CObject DartCObject;
 #include "dart_api.h"
 
 /**

diff --git a/frb_dart/lib/src/ffigen_generated/intermediate/frb_rust.h b/frb_dart/lib/src/ffigen_generated/intermediate/frb_rust.h
@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 typedef struct _Dart_Handle* Dart_Handle;
+typedef struct Dart_CObject DartCObject;
 #include "dart_api.h"
 #include "dart_native_api.h"
 

diff --git a/frb_dart/lib/src/ffigen_generated/multi_package.dart b/frb_dart/lib/src/ffigen_generated/multi_package.dart
@@ -546,6 +546,8 @@ typedef Dart_NativeMessageHandler = ffi.Pointer<
 
 final class _Dart_Handle extends ffi.Opaque {}
 
+final class Dart_CObject1 extends ffi.Opaque {}
+
 /// Posts a message on some port. The message will contain the
 /// Dart_CObject object graph rooted in 'message'.
 ///
@@ -561,10 +563,11 @@ final class _Dart_Handle extends ffi.Opaque {}
 /// return true if the message was posted.
 typedef DartPostCObjectFnType = ffi.Pointer<
     ffi.NativeFunction<
-        ffi.Bool Function(DartPort port_id, ffi.Pointer<ffi.Int> message)>>;
+        ffi.Bool Function(DartPort port_id, ffi.Pointer<DartCObject> message)>>;
 
 /// A port is used to send or receive inter-isolate messages
 typedef DartPort = ffi.Int64;
+typedef DartCObject = Dart_CObject1;
 
 final class WireSyncRust2DartSse extends ffi.Struct {
   external ffi.Pointer<ffi.Uint8> ptr;