Version 2.14.0-339.0.dev

Merge commit '93d5c4eeeff269d798fe66df78aafc28ed3ab605' into 'dev'

Author: Dart CI

pkg/analyzer/lib/src/generated/ffi_verifier.dart

@@ -277,12 +277,26 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
 
     for (Annotation annotation in annotations) {
       if (annotation.name.name == _ffiNativeName) {
+        // All FFI Natives must be static.
         final isStatic = (node is FunctionDeclaration) ||
             ((node is MethodDeclaration) && node.isStatic);
         if (!isStatic) {
           _errorReporter.reportErrorForNode(
               FfiCode.FFI_NATIVE_ONLY_STATIC, node);
         }
+        // Leaf call FFI Natives can't use Handles.
+        ArgumentList? argumentList = annotation.arguments;
+        if (argumentList != null) {
+          NodeList<Expression> arguments = argumentList.arguments;
+          TypeArgumentList? typeArgumentList = annotation.typeArguments;
+          if (typeArgumentList != null) {
+            NodeList<TypeAnnotation> typeArguments = typeArgumentList.arguments;
+            if (typeArguments.isNotEmpty && typeArguments[0].type != null) {
+              _validateFfiLeafCallUsesNoHandles(
+                  arguments, typeArguments[0].type!, node);
+            }
+          }
+        }
       }
     }
   }
@@ -530,7 +544,8 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
         _errorReporter.reportErrorForNode(
             FfiCode.MUST_BE_A_SUBTYPE, node, [TPrime, F, 'asFunction']);
       }
-      _validateFfiLeafCallUsesNoHandles(node, TPrime, node);
+      _validateFfiLeafCallUsesNoHandles(node.argumentList.arguments, TPrime,
+          node);
     }
     _validateIsLeafIsConst(node);
   }
@@ -622,9 +637,8 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  void _validateFfiLeafCallUsesNoHandles(
-      MethodInvocation node, DartType nativeType, AstNode errorNode) {
-    final args = node.argumentList.arguments;
+  void _validateFfiLeafCallUsesNoHandles(NodeList<Expression> args,
+      DartType nativeType, AstNode errorNode) {
     if (args.isNotEmpty) {
       for (final arg in args) {
         if (arg is NamedExpression) {
@@ -817,7 +831,8 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
           FfiCode.MUST_BE_A_SUBTYPE, errorNode, [S, F, 'lookupFunction']);
     }
     _validateIsLeafIsConst(node);
-    _validateFfiLeafCallUsesNoHandles(node, S, typeArguments![0]);
+    _validateFfiLeafCallUsesNoHandles(node.argumentList.arguments, S,
+        typeArguments![0]);
   }
 
   /// Validate that none of the [annotations] are from `dart:ffi`.

pkg/analyzer/test/src/diagnostics/ffi_native_test.dart

@@ -26,4 +26,32 @@ class K {
       error(FfiCode.FFI_NATIVE_ONLY_STATIC, 31, 75),
     ]);
   }
+
+  test_FfiNativeCanUseHandles() async {
+    await assertErrorsInCode(r'''
+import 'dart:ffi';
+@FfiNative<Handle Function(Handle)>('DoesntMatter')
+external Object doesntMatter(Object);
+''', []);
+  }
+
+  test_FfiNativeLeafMustNotReturnHandle() async {
+    await assertErrorsInCode(r'''
+import 'dart:ffi';
+@FfiNative<Handle Function()>('DoesntMatter', isLeaf:true)
+external Object doesntMatter();
+''', [
+      error(FfiCode.LEAF_CALL_MUST_NOT_RETURN_HANDLE, 19, 90),
+    ]);
+  }
+
+  test_FfiNativeLeafMustNotTakeHandles() async {
+    await assertErrorsInCode(r'''
+import 'dart:ffi';
+@FfiNative<Void Function(Handle)>('DoesntMatter', isLeaf:true)
+external void doesntMatter(Object o);
+''', [
+      error(FfiCode.LEAF_CALL_MUST_NOT_TAKE_HANDLE, 19, 100),
+    ]);
+  }
 }

pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart

@@ -707,6 +707,12 @@ class ConstantsTransformer extends RemovingTransformer {
     return evaluateAndTransformWithContext(node, node);
   }
 
+  @override
+  TreeNode visitRedirectingFactoryTearOff(
+      RedirectingFactoryTearOff node, TreeNode? removalSentinel) {
+    return evaluateAndTransformWithContext(node, node);
+  }
+
   @override
   TreeNode visitInstantiation(Instantiation node, TreeNode? removalSentinel) {
     Instantiation result =
@@ -3434,7 +3440,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
 
   @override
   Constant visitRedirectingFactoryTearOff(RedirectingFactoryTearOff node) {
-    return defaultExpression(node);
+    return canonicalize(new RedirectingFactoryTearOffConstant(node.target));
   }
 
   @override

pkg/front_end/lib/src/fasta/kernel/expression_generator.dart

@@ -3178,8 +3178,13 @@ class TypeUseGenerator extends AbstractReadOnlyAccessGenerator {
               tearOffExpression = _helper.forest
                   .createConstructorTearOff(token.charOffset, tearOff);
             } else if (tearOff is Procedure) {
-              tearOffExpression =
-                  _helper.forest.createStaticTearOff(token.charOffset, tearOff);
+              if (tearOff.isRedirectingFactory) {
+                tearOffExpression = _helper.forest
+                    .createRedirectingFactoryTearOff(token.charOffset, tearOff);
+              } else {
+                tearOffExpression = _helper.forest
+                    .createStaticTearOff(token.charOffset, tearOff);
+              }
             } else if (tearOff != null) {
               unhandled("${tearOff.runtimeType}", "buildPropertyAccess",
                   operatorOffset, _helper.uri);

pkg/front_end/lib/src/fasta/kernel/forest.dart

@@ -836,9 +836,17 @@ class Forest {
   StaticTearOff createStaticTearOff(int fileOffset, Procedure procedure) {
     // ignore: unnecessary_null_comparison
     assert(fileOffset != null);
+    assert(!procedure.isRedirectingFactory);
     return new StaticTearOff(procedure)..fileOffset = fileOffset;
   }
 
+  RedirectingFactoryTearOff createRedirectingFactoryTearOff(
+      int fileOffset, Procedure procedure) {
+    // ignore: unnecessary_null_comparison
+    assert(fileOffset != null);
+    return new RedirectingFactoryTearOff(procedure)..fileOffset = fileOffset;
+  }
+
   Instantiation createInstantiation(
       int fileOffset, Expression expression, List<DartType> typeArguments) {
     // ignore: unnecessary_null_comparison

pkg/front_end/lib/src/fasta/kernel/inference_visitor.dart

@@ -225,7 +225,9 @@ class InferenceVisitor
   @override
   ExpressionInferenceResult visitRedirectingFactoryTearOff(
       RedirectingFactoryTearOff node, DartType typeContext) {
-    return _unhandledExpression(node, typeContext);
+    DartType type =
+        node.target.function.computeFunctionType(inferrer.library.nonNullable);
+    return inferrer.instantiateTearOff(type, typeContext, node);
   }
 
   @override

pkg/front_end/testcases/constructor_tearoffs/redirecting_constructors.dart.strong.expect

@@ -62,7 +62,7 @@ static method main() → dynamic
   return self::test();
 
 constants  {
-  #C1 = static-tearoff self::A::redirectingFactory
-  #C2 = static-tearoff self::A::redirectingFactoryChild
-  #C3 = static-tearoff self::A::redirectingTwice
+  #C1 = redirecting-factory-tearoff self::A::redirectingFactory
+  #C2 = redirecting-factory-tearoff self::A::redirectingFactoryChild
+  #C3 = redirecting-factory-tearoff self::A::redirectingTwice
 }

pkg/front_end/testcases/constructor_tearoffs/redirecting_constructors.dart.strong.transformed.expect

@@ -62,7 +62,7 @@ static method main() → dynamic
   return self::test();
 
 constants  {
-  #C1 = static-tearoff self::A::redirectingFactory
-  #C2 = static-tearoff self::A::redirectingFactoryChild
-  #C3 = static-tearoff self::A::redirectingTwice
+  #C1 = redirecting-factory-tearoff self::A::redirectingFactory
+  #C2 = redirecting-factory-tearoff self::A::redirectingFactoryChild
+  #C3 = redirecting-factory-tearoff self::A::redirectingTwice
 }

pkg/front_end/testcases/constructor_tearoffs/redirecting_constructors.dart.weak.expect

@@ -62,7 +62,7 @@ static method main() → dynamic
   return self::test();
 
 constants  {
-  #C1 = static-tearoff self::A::redirectingFactory
-  #C2 = static-tearoff self::A::redirectingFactoryChild
-  #C3 = static-tearoff self::A::redirectingTwice
+  #C1 = redirecting-factory-tearoff self::A::redirectingFactory
+  #C2 = redirecting-factory-tearoff self::A::redirectingFactoryChild
+  #C3 = redirecting-factory-tearoff self::A::redirectingTwice
 }

pkg/front_end/testcases/constructor_tearoffs/redirecting_constructors.dart.weak.transformed.expect

@@ -62,7 +62,7 @@ static method main() → dynamic
   return self::test();
 
 constants  {
-  #C1 = static-tearoff self::A::redirectingFactory
-  #C2 = static-tearoff self::A::redirectingFactoryChild
-  #C3 = static-tearoff self::A::redirectingTwice
+  #C1 = redirecting-factory-tearoff self::A::redirectingFactory
+  #C2 = redirecting-factory-tearoff self::A::redirectingFactoryChild
+  #C3 = redirecting-factory-tearoff self::A::redirectingTwice
 }