fix bug use Future generic error

Author: lancexin

README.md

@@ -27,7 +27,7 @@ dart compile kernel --output=dump_kernel.dart.snapshot bin/dump_kernel.dart
 # 测试编译
 1. 生成kernel_snapshot.d,先用普通方法run一下example,在example/.dart_tool/flutter_build下面会有生成编译临时的文件
 
-2. 执行下面命令测试(注意目录替换)):
+2. 执行下面命令测试(注意目录替换):
 
 
 ## 编译aot dill

example/lib/inject.dart

@@ -256,6 +256,89 @@ class Inject {
     //Function.apply(proceed, positionalParams, _transToNamedParams(namedParams));
   }
 
+  @pragma('vm:entry-point')
+  @pragma("aopd:inject", {
+    "importUri": "package:example/main.dart",
+    "clsName": "",
+    "methodName": "+_test8",
+    "isRegex": false
+  })
+  //必须是static,不然不起作用
+  static dynamic _injectTest8(
+      Object target,
+      String functionName,
+      List<dynamic> positionalParams,
+      Map<dynamic, dynamic> namedParams,
+      Function proceed) async {
+    debugPrint("[Inject] $functionName start ${positionalParams[0]}");
+    return proceed.call(positionalParams[0]);
+  }
+
+  @pragma('vm:entry-point')
+  @pragma("aopd:inject", {
+    "importUri": "package:example/main.dart",
+    "clsName": "",
+    "methodName": "+_test9",
+    "isRegex": false
+  })
+  //必须是static,不然不起作用
+  static dynamic _injectTest9(
+      Object target,
+      String functionName,
+      List<dynamic> positionalParams,
+      Map<dynamic, dynamic> namedParams,
+      Function proceed) async {
+    debugPrint(
+        "[Inject] $functionName start ${positionalParams[0]},p0.type:${positionalParams[0].runtimeType},func.type;${proceed.runtimeType}");
+
+    var r = proceed.call(positionalParams[0]);
+    debugPrint("[Inject] $functionName end ${await r},r.type:${r.runtimeType}");
+    return r;
+  }
+
+  @pragma('vm:entry-point')
+  @pragma("aopd:inject", {
+    "importUri": "package:example/main.dart",
+    "clsName": "G",
+    "methodName": "-getT",
+    "isRegex": false
+  })
+  //必须是static,不然不起作用
+  static dynamic _injectGgetT(
+      Object target,
+      String functionName,
+      List<dynamic> positionalParams,
+      Map<dynamic, dynamic> namedParams,
+      Function proceed) {
+    debugPrint("[Inject] $functionName start func.type;${proceed.runtimeType}");
+
+    var r = proceed.call();
+    debugPrint("[Inject] $functionName end ${r},r.type:${r.runtimeType}");
+    return r;
+  }
+
+  @pragma('vm:entry-point')
+  @pragma("aopd:inject", {
+    "importUri": "package:example/main.dart",
+    "clsName": "G",
+    "methodName": "-setT",
+    "isRegex": false
+  })
+  //必须是static,不然不起作用
+  static dynamic _injectGsetT(
+      Object target,
+      String functionName,
+      List<dynamic> positionalParams,
+      Map<dynamic, dynamic> namedParams,
+      Function proceed) {
+    debugPrint(
+        "[Inject] $functionName start ${positionalParams[0]},p0.type:${positionalParams[0].runtimeType},func.type;${proceed.runtimeType}");
+
+    var r = proceed.call(positionalParams[0]);
+    debugPrint("[Inject] $functionName end ${r},r.type:${r.runtimeType}");
+    return r;
+  }
+
   @pragma('vm:entry-point')
   @pragma("aopd:inject", {
     "importUri": "package:example/main.dart",

example/lib/main.dart

@@ -1,5 +1,6 @@
 import 'package:example/test_mixin.dart';
 import 'package:flutter/material.dart';
+import 'dart:core';
 
 //必须有,不然不起作用
 // ignore: unused_import
@@ -122,6 +123,29 @@ mixin MixinHomePageState2<T extends StatefulWidget> on State<T> {
   }
 }
 
+T _test8<T>(T t) {
+  print("_test8 t.type is ${t.runtimeType}");
+  return t;
+}
+
+Future<T> _test9<T>(T t) async {
+  print("_test9 t.type is ${t.runtimeType}");
+  return t;
+}
+
+class G<T> {
+  T t;
+
+  G(this.t);
+  T getT() {
+    return t;
+  }
+
+  void setT(T t) {
+    this.t = t;
+  }
+}
+
 abstract class Repository {}
 
 abstract class BaseRepository extends Repository with MixinUpgrade {
@@ -188,6 +212,30 @@ class _MyHomePageState extends State<MyHomePage>
     _test6(_counter, "positional6");
     _test7(_counter, "positional7");
 
+    _test8(1);
+    _test8(1.1);
+    _test8("aaa");
+
+    var t1 = await _test9(1);
+    var t2 = await _test9("aaa");
+
+    var f = Future(() {
+      return 1;
+    });
+
+    var t3 = await _test9(f);
+    print("${t1} t1.type ${t1.runtimeType}");
+    print("${t2} t2.type ${t2.runtimeType}");
+    print("${t3} t3.type ${t3.runtimeType}");
+
+    var g = G(1);
+    var t4 = g.getT();
+    print("${t4} t4.type ${t4.runtimeType}");
+
+    var g2 = G("aaa");
+    var t5 = g2.getT();
+    print("${t5} t5.type ${t5.runtimeType}");
+
     repository.getAppVersion(packageName: "packageName");
     repository.getAppVersion2(packageName: "packageName2");
     repository.p1 = 1;

frontend_server_aot_linux.dart.snapshot

@@ -5,6 +5,7 @@ import 'dart:io';
 import 'package:frontend_server/frontend_server.dart' as frontend;
 
 import 'package:kernel/ast.dart';
+import 'package:kernel/core_types.dart';
 import 'utils.dart';
 
 class MethodItem {
@@ -573,10 +574,29 @@ class _MethodExecuteVisitor extends RecursiveVisitor {
     final List<MapLiteralEntry> entries = <MapLiteralEntry>[];
     for (NamedExpression namedExpression in originArguments.named) {
       //这里用SymbolLiteral貌似无效,退而求其次用StringLiteral
+
       entries.add(MapLiteralEntry(
           StringLiteral(namedExpression.name), namedExpression.value));
     }
     redirectArguments.positional.add(MapLiteral(entries));
+
+    //如果返回类型是 Future 或者FutureOrType,强制转换成 dynamic
+    if (shouldReturn && functionNode.returnType is FutureOrType ||
+        (functionNode.returnType is InterfaceType &&
+            (functionNode.returnType as InterfaceType)
+                    .classNode
+                    .enclosingLibrary
+                    .importUri
+                    .toString() ==
+                'dart:async' &&
+            (functionNode.returnType as InterfaceType).classNode.name ==
+                'Future')) {
+      stdout.writeln(
+          "${originalProcedure.name.toString()} return type is FutureOrType ${functionNode.returnType.toStringInternal()}");
+      //这里还有第二种做法，强制返回 Future<dynamic>
+      functionNode.returnType = DynamicType();
+      functionNode.emittedValueType = DynamicType();
+    }
     //proceed
     final FunctionNode newFunctionNode = FunctionNode(bodyStatements,
         typeParameters: AopUtils.deepCopyASTNodes<TypeParameter>(