[vm/ffi] Migrate off .addressOf in tests

Removes invocations of `.addressOf` in tests.

Removes the constructor from the Coordinate testing class which
has become useless with no access to the underlying pointer.

Removes the bare variant of Coordinate because it is identical to the
non-bare variant.

Issue: #40667

Change-Id: Ie26fa3a9cac38e794e93f5fadfec2562a814c1ae
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/181403
Reviewed-by: Aske Simon Christensen <[email protected]>
Commit-Queue: Daco Harkes <[email protected]>

Author: dcharkes

tests/ffi/coordinate.dart

@@ -5,7 +5,6 @@
 library FfiTest;
 
 import 'dart:ffi';
-import "package:ffi/ffi.dart";
 
 /// Sample struct for dart:ffi library.
 class Coordinate extends Struct {
@@ -16,12 +15,4 @@ class Coordinate extends Struct {
   external double y;
 
   external Pointer<Coordinate> next;
-
-  factory Coordinate.allocate(
-      Allocator allocator, double x, double y, Pointer<Coordinate> next) {
-    return allocator<Coordinate>().ref
-      ..x = x
-      ..y = y
-      ..next = next;
-  }
 }

tests/ffi/coordinate_bare.dart

@@ -1,11 +1,12 @@
 // Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
+//
+// Dart test program for testing getters/setters in structs rather than fields.
 
 library FfiTest;
 
 import 'dart:ffi';
-import "package:ffi/ffi.dart";
 
 /// Sample struct for dart:ffi library.
 class Coordinate extends Struct {
@@ -19,12 +20,4 @@ class Coordinate extends Struct {
 
   external Pointer<Coordinate> get next;
   external set next(Pointer<Coordinate> v);
-
-  factory Coordinate.allocate(
-      Allocator allocator, double x, double y, Pointer<Coordinate> next) {
-    return allocator<Coordinate>().ref
-      ..x = x
-      ..y = y
-      ..next = next;
-  }
 }

tests/ffi/coordinate_nnbd_workaround.dart

@@ -24,7 +24,8 @@ void main() {
 }
 
 void recursiveTest(int recursionCounter) {
-  final struct = calloc<Struct20BytesHomogeneousInt32>().ref;
+  final pointer = calloc<Struct20BytesHomogeneousInt32>();
+  final struct = pointer.ref;
   struct.a0 = 1;
   struct.a1 = 2;
   struct.a2 = 3;
@@ -36,7 +37,7 @@ void recursiveTest(int recursionCounter) {
   Expect.equals(struct.a2, result.a2);
   Expect.equals(struct.a3, result.a3);
   Expect.equals(struct.a4, result.a4);
-  calloc.free(struct.addressOf);
+  calloc.free(pointer);
 }
 
 Struct20BytesHomogeneousInt32 dartPassStructRecursive(
@@ -94,7 +95,8 @@ void testCopyLogic() {
   _invokeReceiveStructByValue(_receiveStructByValuePointer);
   Expect.isTrue(typedDataBackedStructSet);
 
-  final pointerBackedStruct = calloc<Struct8BytesNestedInt>().ref;
+  final pointer = calloc<Struct8BytesNestedInt>();
+  final pointerBackedStruct = pointer.ref;
 
   void reset() {
     pointerBackedStruct.a0.a0 = 1;
@@ -131,5 +133,5 @@ void testCopyLogic() {
   Expect.equals(5, typedDataBackedStruct.a1.a0);
   Expect.equals(6, typedDataBackedStruct.a1.a1);
 
-  calloc.free(pointerBackedStruct.addressOf);
+  calloc.free(pointer);
 }

tests/ffi/function_callbacks_structs_by_value_test.dart

@@ -9,13 +9,12 @@
 
 import 'dart:ffi';
 
-import 'dylib_utils.dart';
-
 import "package:expect/expect.dart";
 import "package:ffi/ffi.dart";
 
 import 'calloc.dart';
 import 'coordinate.dart';
+import 'dylib_utils.dart';
 import 'very_large_struct.dart';
 
 typedef NativeCoordinateOp = Pointer<Coordinate> Function(Pointer<Coordinate>);
@@ -34,10 +33,13 @@ void testFunctionWithStruct() {
       ffiTestFunctions.lookup("TransposeCoordinate");
   NativeCoordinateOp f1 = p1.asFunction();
 
-  Pointer<Coordinate> c1 =
-      Coordinate.allocate(calloc, 10.0, 20.0, nullptr).addressOf;
-  Pointer<Coordinate> c2 =
-      Coordinate.allocate(calloc, 42.0, 84.0, c1).addressOf;
+  final c1 = calloc<Coordinate>()
+    ..ref.x = 10.0
+    ..ref.y = 20.0;
+  final c2 = calloc<Coordinate>()
+    ..ref.x = 42.0
+    ..ref.y = 84.0
+    ..ref.next = c1;
   c1.ref.next = c2;
 
   Coordinate result = f1(c1).ref;
@@ -58,24 +60,25 @@ void testFunctionWithStructArray() {
       ffiTestFunctions.lookup("CoordinateElemAt1");
   NativeCoordinateOp f1 = p1.asFunction();
 
-  Coordinate c1 = calloc<Coordinate>(3).ref;
-  Coordinate c2 = c1.addressOf[1];
-  Coordinate c3 = c1.addressOf[2];
+  final coordinateArray = calloc<Coordinate>(3);
+  Coordinate c1 = coordinateArray[0];
+  Coordinate c2 = coordinateArray[1];
+  Coordinate c3 = coordinateArray[2];
   c1.x = 10.0;
   c1.y = 10.0;
-  c1.next = c3.addressOf;
+  c1.next = coordinateArray.elementAt(2);
   c2.x = 20.0;
   c2.y = 20.0;
-  c2.next = c1.addressOf;
+  c2.next = coordinateArray.elementAt(0);
   c3.x = 30.0;
   c3.y = 30.0;
-  c3.next = c2.addressOf;
+  c3.next = coordinateArray.elementAt(1);
 
-  Coordinate result = f1(c1.addressOf).ref;
+  Coordinate result = f1(coordinateArray.elementAt(0)).ref;
   Expect.approxEquals(20.0, result.x);
   Expect.approxEquals(20.0, result.y);
 
-  calloc.free(c1.addressOf);
+  calloc.free(coordinateArray);
 }
 
 typedef VeryLargeStructSum = int Function(Pointer<VeryLargeStruct>);
@@ -86,8 +89,9 @@ void testFunctionWithVeryLargeStruct() {
       ffiTestFunctions.lookup("SumVeryLargeStruct");
   VeryLargeStructSum f = p1.asFunction();
 
-  VeryLargeStruct vls1 = calloc<VeryLargeStruct>(2).ref;
-  VeryLargeStruct vls2 = vls1.addressOf[1];
+  final vlsArray = calloc<VeryLargeStruct>(2);
+  VeryLargeStruct vls1 = vlsArray[0];
+  VeryLargeStruct vls2 = vlsArray[1];
   List<VeryLargeStruct> structs = [vls1, vls2];
   for (VeryLargeStruct struct in structs) {
     struct.a = 1;
@@ -103,19 +107,19 @@ void testFunctionWithVeryLargeStruct() {
     struct.k = 1024;
     struct.smallLastField = 1;
   }
-  vls1.parent = vls2.addressOf;
+  vls1.parent = vlsArray.elementAt(1);
   vls1.numChildren = 2;
-  vls1.children = vls1.addressOf;
-  vls2.parent = vls2.addressOf;
+  vls1.children = vlsArray.elementAt(0);
+  vls2.parent = vlsArray.elementAt(1);
   vls2.parent = nullptr;
   vls2.numChildren = 0;
   vls2.children = nullptr;
 
-  int result = f(vls1.addressOf);
+  int result = f(vlsArray.elementAt(0));
   Expect.equals(2051, result);
 
-  result = f(vls2.addressOf);
+  result = f(vlsArray.elementAt(1));
   Expect.equals(2048, result);
 
-  calloc.free(vls1.addressOf);
+  calloc.free(vlsArray);
 }

tests/ffi/function_structs_test.dart

@@ -61,10 +61,8 @@ void testRead() {
   final p = calloc<Struct8BytesNestedInt>();
   print(p);
   print(p.ref.runtimeType);
-  print(p.ref.addressOf);
-  print(p.ref.addressOf.address);
+  print(p.address);
   print(p.ref.a0.runtimeType);
-  print(p.ref.a0.addressOf);
   print(p.ref.a0.a0);
   calloc.free(p);
   print("read");

tests/ffi/structs_nested_test.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 //
-// Dart test program for testing dart:ffi struct pointers.
+// Dart test program for testing getters/setters in structs rather than fields.
 //
 // VMOptions=--deterministic --optimization-counter-threshold=50
 
@@ -26,12 +26,17 @@ void main() {
 
 /// allocates each coordinate separately in c memory
 void testStructAllocate() {
-  Pointer<Coordinate> c1 =
-      Coordinate.allocate(calloc, 10.0, 10.0, nullptr).addressOf;
-  Pointer<Coordinate> c2 =
-      Coordinate.allocate(calloc, 20.0, 20.0, c1).addressOf;
-  Pointer<Coordinate> c3 =
-      Coordinate.allocate(calloc, 30.0, 30.0, c2).addressOf;
+  final c1 = calloc<Coordinate>()
+    ..ref.x = 10.0
+    ..ref.y = 10.0;
+  final c2 = calloc<Coordinate>()
+    ..ref.x = 20.0
+    ..ref.y = 20.0
+    ..ref.next = c1;
+  final c3 = calloc<Coordinate>()
+    ..ref.x = 30.0
+    ..ref.y = 30.0
+    ..ref.next = c2;
   c1.ref.next = c3;
 
   Coordinate currentCoordinate = c1.ref;
@@ -79,8 +84,9 @@ void testStructFromAddress() {
 }
 
 void testStructWithNulls() {
-  Pointer<Coordinate> coordinate =
-      Coordinate.allocate(calloc, 10.0, 10.0, nullptr).addressOf;
+  final coordinate = calloc<Coordinate>()
+    ..ref.x = 10.0
+    ..ref.y = 10.0;
   Expect.equals(coordinate.ref.next, nullptr);
   coordinate.ref.next = coordinate;
   Expect.notEquals(coordinate.ref.next, nullptr);
@@ -90,10 +96,12 @@ void testStructWithNulls() {
 }
 
 void testTypeTest() {
-  Coordinate c = Coordinate.allocate(calloc, 10, 10, nullptr);
+  final pointer = calloc<Coordinate>();
+  Coordinate c = pointer.ref;
   Expect.isTrue(c is Struct);
+  // TODO(https://dartbug.com/40667): Remove support for this.
   Expect.isTrue(c.addressOf is Pointer<Coordinate>);
-  calloc.free(c.addressOf);
+  calloc.free(pointer);
 }
 
 void testUtf8() {

tests/ffi/structs_nnbd_workaround_test.dart

@@ -4,24 +4,21 @@
 //
 // Dart test program for testing dart:ffi struct pointers.
 //
-// VMOptions=--deterministic --optimization-counter-threshold=50
+// VMOptions=--deterministic --optimization-counter-threshold=50 --enable-inlining-annotations
 
 import 'dart:ffi';
 
 import "package:expect/expect.dart";
 import "package:ffi/ffi.dart";
 
 import 'calloc.dart';
-import 'coordinate_bare.dart' as bare;
 import 'coordinate.dart';
-import 'ffi_test_helpers.dart';
 
 void main() {
   for (int i = 0; i < 100; i++) {
     testStructAllocate();
     testStructFromAddress();
     testStructWithNulls();
-    testBareStruct();
     testTypeTest();
     testUtf8();
     testDotDotRef();
@@ -30,12 +27,17 @@ void main() {
 
 /// allocates each coordinate separately in c memory
 void testStructAllocate() {
-  Pointer<Coordinate> c1 =
-      Coordinate.allocate(calloc, 10.0, 10.0, nullptr).addressOf;
-  Pointer<Coordinate> c2 =
-      Coordinate.allocate(calloc, 20.0, 20.0, c1).addressOf;
-  Pointer<Coordinate> c3 =
-      Coordinate.allocate(calloc, 30.0, 30.0, c2).addressOf;
+  final c1 = calloc<Coordinate>()
+    ..ref.x = 10.0
+    ..ref.y = 10.0;
+  final c2 = calloc<Coordinate>()
+    ..ref.x = 20.0
+    ..ref.y = 20.0
+    ..ref.next = c1;
+  final c3 = calloc<Coordinate>()
+    ..ref.x = 30.0
+    ..ref.y = 30.0
+    ..ref.next = c2;
   c1.ref.next = c3;
 
   Coordinate currentCoordinate = c1.ref;
@@ -83,8 +85,9 @@ void testStructFromAddress() {
 }
 
 void testStructWithNulls() {
-  Pointer<Coordinate> coordinate =
-      Coordinate.allocate(calloc, 10.0, 10.0, nullptr).addressOf;
+  final coordinate = calloc<Coordinate>()
+    ..ref.x = 10.0
+    ..ref.y = 10.0;
   Expect.equals(coordinate.ref.next, nullptr);
   coordinate.ref.next = coordinate;
   Expect.notEquals(coordinate.ref.next, nullptr);
@@ -93,41 +96,13 @@ void testStructWithNulls() {
   calloc.free(coordinate);
 }
 
-void testBareStruct() {
-  int structSize = sizeOf<Double>() * 2 + sizeOf<IntPtr>();
-  bare.Coordinate c1 =
-      calloc<Uint8>(structSize * 3).cast<bare.Coordinate>().ref;
-  bare.Coordinate c2 =
-      c1.addressOf.offsetBy(structSize).cast<bare.Coordinate>().ref;
-  bare.Coordinate c3 =
-      c1.addressOf.offsetBy(structSize * 2).cast<bare.Coordinate>().ref;
-  c1.x = 10.0;
-  c1.y = 10.0;
-  c1.next = c3.addressOf;
-  c2.x = 20.0;
-  c2.y = 20.0;
-  c2.next = c1.addressOf;
-  c3.x = 30.0;
-  c3.y = 30.0;
-  c3.next = c2.addressOf;
-
-  bare.Coordinate currentCoordinate = c1;
-  Expect.equals(10.0, currentCoordinate.x);
-  currentCoordinate = currentCoordinate.next.ref;
-  Expect.equals(30.0, currentCoordinate.x);
-  currentCoordinate = currentCoordinate.next.ref;
-  Expect.equals(20.0, currentCoordinate.x);
-  currentCoordinate = currentCoordinate.next.ref;
-  Expect.equals(10.0, currentCoordinate.x);
-
-  calloc.free(c1.addressOf);
-}
-
 void testTypeTest() {
-  Coordinate c = Coordinate.allocate(calloc, 10, 10, nullptr);
+  final pointer = calloc<Coordinate>();
+  Coordinate c = pointer.ref;
   Expect.isTrue(c is Struct);
+  // TODO(https://dartbug.com/40667): Remove support for this.
   Expect.isTrue(c.addressOf is Pointer<Coordinate>);
-  calloc.free(c.addressOf);
+  calloc.free(pointer);
 }
 
 void testUtf8() {