Record if MethodDeclaration has NativeFunctionBody, so it external.

scheglov · commit-bot@chromium.org · commit 9bb446aae194 · 2019-08-02T19:43:39.000Z
This fixes the issue with failing DDC tests like this: co19_2/LayoutTests/fast/media/matchmedium-query-api_t01 R=brianwilkerson@google.com, paulberry@google.com TypeError: html.window.styleMedia[$matchMedium] is not a function Change-Id: Ic7a80c53122cdc3e0bcce835b5717413e342ce74 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/111862 Reviewed-by: Paul Berry <paulberry@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/summary2/ast_binary_flags.dart b/pkg/analyzer/lib/src/summary2/ast_binary_flags.dart
@@ -166,6 +166,11 @@ class AstBinaryFlags {
     TypedLiteral,
   );
 
+  static final _isNative = _checkBit(
+    8,
+    MethodDeclaration,
+  );
+
   static final _isNew = _checkBit(
     0,
     InstanceCreationExpression,
@@ -246,6 +251,7 @@ class AstBinaryFlags {
     bool isGet: false,
     bool isLate: false,
     bool isMap: false,
+    bool isNative: false,
     bool isNew: false,
     bool isOperator: false,
     bool isRequired: false,
@@ -338,6 +344,9 @@ class AstBinaryFlags {
     if (isMap) {
       result |= _isMap;
     }
+    if (isNative) {
+      result |= _isNative;
+    }
     if (isNew) {
       result |= _isNew;
     }
@@ -476,6 +485,10 @@ class AstBinaryFlags {
     return (flags & _isMap) != 0;
   }
 
+  static bool isNative(int flags) {
+    return (flags & _isNative) != 0;
+  }
+
   static bool isNew(int flags) {
     return (flags & _isNew) != 0;
   }
diff --git a/pkg/analyzer/lib/src/summary2/ast_binary_reader.dart b/pkg/analyzer/lib/src/summary2/ast_binary_reader.dart
@@ -1108,6 +1108,15 @@ class AstBinaryReader {
   }
 
   MethodDeclaration _read_methodDeclaration(LinkedNode data) {
+    FunctionBody body;
+    if (AstBinaryFlags.isNative(data.flags)) {
+      body = AstTestFactory.nativeFunctionBody('');
+    } else if (AstBinaryFlags.isAbstract(data.flags)) {
+      body = AstTestFactory.emptyFunctionBody();
+    } else {
+      body = AstTestFactory.blockFunctionBody(AstTestFactory.block());
+    }
+
     var node = astFactory.methodDeclaration(
       _readDocumentationComment(data),
       _readNodeListLazy(data.annotatedNode_metadata),
@@ -1124,9 +1133,7 @@ class AstBinaryReader {
       _declaredIdentifier(data),
       _readNode(data.methodDeclaration_typeParameters),
       _readNodeLazy(data.methodDeclaration_formalParameters),
-      AstBinaryFlags.isAbstract(data.flags)
-          ? AstTestFactory.emptyFunctionBody()
-          : AstTestFactory.blockFunctionBody(AstTestFactory.block()),
+      body,
     );
     LazyMethodDeclaration.setData(node, data);
     return node;
diff --git a/pkg/analyzer/lib/src/summary2/ast_binary_writer.dart b/pkg/analyzer/lib/src/summary2/ast_binary_writer.dart
@@ -924,6 +924,7 @@ class AstBinaryWriter extends ThrowingAstVisitor<LinkedNodeBuilder> {
       isExternal: node.externalKeyword != null,
       isGenerator: node.body?.isGenerator ?? false,
       isGet: node.isGetter,
+      isNative: node.body is NativeFunctionBody,
       isOperator: node.operatorKeyword != null,
       isSet: node.isSetter,
       isStatic: node.isStatic,
diff --git a/pkg/analyzer/lib/src/summary2/linked_unit_context.dart b/pkg/analyzer/lib/src/summary2/linked_unit_context.dart
@@ -779,7 +779,7 @@ class LinkedUnitContext {
     } else if (node is FunctionDeclaration) {
       return node.externalKeyword != null;
     } else if (node is MethodDeclaration) {
-      return node.externalKeyword != null;
+      return node.externalKeyword != null || node.body is NativeFunctionBody;
     } else {
       throw UnimplementedError('${node.runtimeType}');
     }
@@ -831,6 +831,14 @@ class LinkedUnitContext {
     throw UnimplementedError('${node.runtimeType}');
   }
 
+  bool isNative(AstNode node) {
+    if (node is MethodDeclaration) {
+      return node.body is NativeFunctionBody;
+    } else {
+      throw UnimplementedError('${node.runtimeType}');
+    }
+  }
+
   bool isSetter(AstNode node) {
     if (node is FunctionDeclaration) {
       return node.isSetter;
diff --git a/pkg/analyzer/test/src/summary/resynthesize_common.dart b/pkg/analyzer/test/src/summary/resynthesize_common.dart
@@ -1107,6 +1107,19 @@ class C {
 ''');
   }
 
+  test_class_getter_native() async {
+    var library = await checkLibrary('''
+class C {
+  int get x() native;
+}
+''');
+    checkElementText(library, r'''
+class C {
+  external int get x;
+}
+''');
+  }
+
   test_class_getter_static() async {
     var library = await checkLibrary('class C { static int get x => null; }');
     checkElementText(library, r'''
@@ -1221,6 +1234,19 @@ class B extends A {
 ''');
   }
 
+  test_class_method_native() async {
+    var library = await checkLibrary('''
+class C {
+  int m() native;
+}
+''');
+    checkElementText(library, r'''
+class C {
+  external int m() {}
+}
+''');
+  }
+
   test_class_method_params() async {
     var library = await checkLibrary('class C { f(x, y) {} }');
     checkElementText(library, r'''
@@ -1621,6 +1647,19 @@ class C {
 ''');
   }
 
+  test_class_setter_native() async {
+    var library = await checkLibrary('''
+class C {
+  void set x(int value) native;
+}
+''');
+    checkElementText(library, r'''
+class C {
+  external void set x(int value);
+}
+''');
+  }
+
   test_class_setter_static() async {
     var library =
         await checkLibrary('class C { static void set x(int value) {} }');
