Fix some other little bugs

dart-lang · Oct 29, 2024 · d363475 · d363475
1 parent 0bec7ce
commit d363475
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 14 deletions.
diff --git a/pkgs/ffigen/lib/src/code_generator/imports.dart b/pkgs/ffigen/lib/src/code_generator/imports.dart
@@ -135,6 +135,6 @@ final wCharType = ImportedType(ffiImport, 'WChar', 'int', 'wchar_t', '0');
 final objCObjectType =
     ImportedType(objcPkgImport, 'ObjCObject', 'ObjCObject', 'void');
 final objCSelType = ImportedType(
-    objcPkgImport, 'ObjCSelector', 'ObjCSelector', 'objc_selector');
+    objcPkgImport, 'ObjCSelector', 'ObjCSelector', 'struct objc_selector');
 final objCBlockType =
     ImportedType(objcPkgImport, 'ObjCBlockImpl', 'ObjCBlockImpl', 'id');
diff --git a/pkgs/ffigen/lib/src/code_generator/objc_interface.dart b/pkgs/ffigen/lib/src/code_generator/objc_interface.dart
@@ -154,10 +154,18 @@ class ObjCInterface extends BindingType with ObjCMethods {
       s.write(' {\n');
 
       // Implementation.
+      final target = isStatic
+          ? _classObject.name
+          : convertDartTypeToFfiDartType(
+              w,
+              'this',
+              objCRetain: m.consumesSelf,
+              objCAutorelease: false,
+            );
       final sel = m.selObject.name;
       if (m.isOptional) {
         s.write('''
-    if (!${ObjCBuiltInFunctions.respondsToSelector.gen(w)}(ref.pointer, $sel)) {
+    if (!${ObjCBuiltInFunctions.respondsToSelector.gen(w)}($target, $sel)) {
       throw ${ObjCBuiltInFunctions.unimplementedOptionalMethodException.gen(w)}(
           '$originalName', '${m.originalName}');
     }
@@ -166,14 +174,6 @@ class ObjCInterface extends BindingType with ObjCMethods {
       final convertReturn = m.kind != ObjCMethodKind.propertySetter &&
           !returnType.sameDartAndFfiDartType;
 
-      final target = isStatic
-          ? _classObject.name
-          : convertDartTypeToFfiDartType(
-              w,
-              'this',
-              objCRetain: m.consumesSelf,
-              objCAutorelease: false,
-            );
       final msgSendParams =
           m.params.map((p) => p.type.convertDartTypeToFfiDartType(
                 w,

diff --git a/pkgs/ffigen/lib/src/visitor/apply_config_filters.dart b/pkgs/ffigen/lib/src/visitor/apply_config_filters.dart
@@ -37,15 +37,22 @@ class ApplyConfigFiltersVisitation extends Visitation {
 
   @override
   void visitObjCInterface(ObjCInterface node) {
-    node.filterMethods((method) =>
-        config.objcInterfaces.shouldIncludeMember(node, method.originalName));
+    node.filterMethods(
+        (m) => config.objcInterfaces.shouldIncludeMember(node, m.originalName));
     _visitImpl(node, config.objcInterfaces);
   }
 
   @override
   void visitObjCProtocol(ObjCProtocol node) {
-    node.filterMethods((method) =>
-        config.objcProtocols.shouldIncludeMember(node, method.originalName));
+    node.filterMethods((m) {
+      // TODO(https://github.com/dart-lang/native/issues/1149): Support class
+      // methods on protocols if there's a use case. For now filter them. We
+      // filter here instead of during parsing so that these methods are still
+      // copied to any interfaces that implement the protocol.
+      if (m.isClassMethod) return false;
+
+      return config.objcProtocols.shouldIncludeMember(node, m.originalName);
+    });
     _visitImpl(node, config.objcProtocols);
   }
 

diff --git a/pkgs/ffigen/test/native_objc_test/block_config.yaml b/pkgs/ffigen/test/native_objc_test/block_config.yaml
@@ -14,6 +14,7 @@ typedefs:
     - FloatBlock
     - DoubleBlock
     - Vec4Block
+    - SelectorBlock
     - VoidBlock
     - ObjectBlock
     - NullableObjectBlock

diff --git a/pkgs/ffigen/test/native_objc_test/block_test.dart b/pkgs/ffigen/test/native_objc_test/block_test.dart
@@ -27,6 +27,7 @@ typedef ListenerBlock = ObjCBlock_ffiVoid_IntBlock;
 typedef FloatBlock = ObjCBlock_ffiFloat_ffiFloat;
 typedef DoubleBlock = ObjCBlock_ffiDouble_ffiDouble;
 typedef Vec4Block = ObjCBlock_Vec4_Vec4;
+typedef SelectorBlock = ObjCBlock_ffiVoid_objcObjCSelector;
 typedef ObjectBlock = ObjCBlock_DummyObject_DummyObject;
 typedef NullableObjectBlock = ObjCBlock_DummyObject_DummyObject1;
 typedef NullableStringBlock = ObjCBlock_NSString_NSString;
@@ -162,6 +163,19 @@ void main() {
       });
     });
 
+    test('Selector block', () {
+      late String sel;
+      final block = SelectorBlock.fromFunction((Pointer<ObjCSelector> x) {
+        sel = x.toDartString();
+      });
+
+      block('Hello'.toSelector());
+      expect(sel, 'Hello');
+
+      BlockTester.callSelectorBlock_(block);
+      expect(sel, 'Select');
+    });
+
     test('Object block', () {
       bool isCalled = false;
       final block = ObjectBlock.fromFunction((DummyObject x) {

diff --git a/pkgs/ffigen/test/native_objc_test/block_test.h b/pkgs/ffigen/test/native_objc_test/block_test.h
@@ -35,6 +35,7 @@ typedef float (^FloatBlock)(float);
 typedef double (^DoubleBlock)(double);
 typedef Vec4 (^Vec4Block)(Vec4);
 typedef void (^VoidBlock)();
+typedef void (^SelectorBlock)(SEL);
 typedef DummyObject* (^ObjectBlock)(DummyObject*);
 typedef DummyObject* _Nullable (^NullableObjectBlock)(DummyObject* _Nullable);
 typedef NSString* _Nullable (^NullableStringBlock)(NSString* _Nullable);
@@ -64,6 +65,7 @@ typedef void (^NoTrampolineListenerBlock)(int32_t, Vec4, const char*);
 + (float)callFloatBlock:(FloatBlock)block;
 + (double)callDoubleBlock:(DoubleBlock)block;
 + (Vec4)callVec4Block:(Vec4Block)block;
++ (void)callSelectorBlock:(SelectorBlock)block;
 + (DummyObject*)callObjectBlock:(ObjectBlock)block NS_RETURNS_RETAINED;
 + (nullable DummyObject*)callNullableObjectBlock:(NullableObjectBlock)block
     NS_RETURNS_RETAINED;

diff --git a/pkgs/ffigen/test/native_objc_test/block_test.m b/pkgs/ffigen/test/native_objc_test/block_test.m
@@ -153,6 +153,10 @@ + (Vec4)callVec4Block:(Vec4Block)block {
   return block(vec4);
 }
 
++ (void)callSelectorBlock:(SelectorBlock)block {
+  block(sel_registerName("Select"));
+}
+
 + (DummyObject*)callObjectBlock:(ObjectBlock)block NS_RETURNS_RETAINED {
   return block([DummyObject new]);
 }

diff --git a/pkgs/ffigen/test/native_objc_test/protocol_test.dart b/pkgs/ffigen/test/native_objc_test/protocol_test.dart
@@ -73,6 +73,10 @@ void main() {
 
         // Method from a protocol that isn't included by the filters.
         expect(protocolImpl.fooMethod(), 2468);
+
+        // Class methods.
+        expect(ObjCProtocolImpl.requiredClassMethod(), 9876);
+        expect(ObjCProtocolImpl.optionalClassMethod(), 5432);
       });
 
       test('Unimplemented method', () {
@@ -94,6 +98,9 @@ void main() {
         expect(() => protocolImpl.optionalMethod_(structPtr.ref),
             throwsA(isA<UnimplementedOptionalMethodException>()));
         calloc.free(structPtr);
+
+        expect(() => ObjCProtocolImpl.unimplementedOtionalClassMethod(),
+            throwsA(isA<UnimplementedOptionalMethodException>()));
       });
     });
 

diff --git a/pkgs/ffigen/test/native_objc_test/protocol_test.h b/pkgs/ffigen/test/native_objc_test/protocol_test.h
@@ -25,6 +25,17 @@ typedef struct {
 @optional
 - (void)voidMethod:(int32_t)x;
 
+// Class methods aren't supported in protocol implementation from Dart, but they
+// are still codegenned for any native interfaces that implement this protocol.
+@required
++ (int32_t)requiredClassMethod;
+
+@optional
++ (int32_t)optionalClassMethod;
+
+@optional
++ (int32_t)unimplementedOtionalClassMethod;
+
 @end
 
 

diff --git a/pkgs/ffigen/test/native_objc_test/protocol_test.m b/pkgs/ffigen/test/native_objc_test/protocol_test.m
@@ -49,6 +49,14 @@ - (int32_t)fooMethod {
   return 2468;
 }
 
++ (int32_t)requiredClassMethod {
+  return 9876;
+}
+
++ (int32_t)optionalClassMethod {
+  return 5432;
+}
+
 @end