Handle generic types in native behavior

Previous implementation didn't include subtypes of the specified type.
For instance `JS('Rectangle', ...)` should have triggered the inclusion
of `_DomRect` but the use of this-type in the subtype test,
`_DomRect <: Rectangle<T>`, prohibited this.

This fix is to use the raw type instead of the this-type. The subtype test
will therefore be `_DomRect <: Rectangle<dynamic>` which correctly
includes `_DomRect`.

The change has the effect that `JS('List', ...)` now actually includes subtypes of
`List`. For this reason uses of `List` have been updated to use `JSArray` or
explicitly use `returns:...` to avoid unintended inclusion of native lists such
as the native typed arrays.

Change-Id: I06ab55d9bf694829596875d9c3a0a6c954d396b7
Reviewed-on: https://dart-review.googlesource.com/73903
Reviewed-by: Stephen Adams <sra@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>

Author: johnniwinther

pkg/compiler/lib/src/native/enqueue.dart

@@ -121,9 +121,8 @@ abstract class NativeEnqueuerBase implements NativeEnqueuer {
         matchingClasses
             .addAll(_findUnusedClassesMatching((ClassEntity nativeClass) {
           InterfaceType nativeType =
-              _elementEnvironment.getThisType(nativeClass);
-          InterfaceType specType =
-              _elementEnvironment.getThisType(type.element);
+              _elementEnvironment.getRawType(nativeClass);
+          InterfaceType specType = _elementEnvironment.getRawType(type.element);
           return _dartTypes.isSubtype(nativeType, specType);
         }));
       } else if (type.isDynamic) {

pkg/compiler/lib/src/resolution/registry.dart

@@ -131,7 +131,7 @@ class ResolutionWorldImpactBuilder extends WorldImpactBuilderImpl
 
   String toString() {
     StringBuffer sb = new StringBuffer();
-    sb.write('_ResolutionWorldImpact($name)');
+    sb.write('ResolutionWorldImpactBuilder($name)');
     WorldImpact.printOn(sb, this);
     if (_features != null) {
       sb.write('\n features:');

pkg/compiler/lib/src/ssa/kernel_impact.dart

@@ -51,7 +51,7 @@ class KernelImpactBuilder extends ir.Visitor {
   KernelImpactBuilder(
       this.elementMap, this.currentMember, this.reporter, this._options)
       : this.impactBuilder =
-            new ResolutionWorldImpactBuilder('${currentMember.name}') {
+            new ResolutionWorldImpactBuilder('${currentMember}') {
     this.classEnsurer = new _ClassEnsurer(this, this.elementMap.types);
   }
 

pkg/compiler/lib/src/ssa/types.dart

@@ -64,7 +64,8 @@ class AbstractValueFactory {
 
     AbstractValue result =
         abstractValueDomain.unionOfMany(typesReturned.map(fromNativeType));
-    assert(!abstractValueDomain.isEmpty(result));
+    assert(!abstractValueDomain.isEmpty(result),
+        "Unexpected empty return value for $nativeBehavior.");
     return result;
   }
 }

sdk/lib/_internal/js_runtime/lib/js_number.dart

@@ -217,7 +217,7 @@ class JSNumber extends Interceptor implements double {
   static String _handleIEtoString(String result) {
     // Result is probably IE's untraditional format for large numbers,
     // e.g., "8.0000000000008(e+15)" for 0x8000000000000800.toString(16).
-    var match = JS('List|Null',
+    var match = JS('JSArray|Null',
         r'/^([\da-z]+)(?:\.([\da-z]+))?\(e\+(\d+)\)$/.exec(#)', result);
     if (match == null) {
       // Then we don't know how to handle it at all.

sdk/lib/html/html_common/conversions.dart

@@ -128,7 +128,7 @@ abstract class _StructuredClone {
       // non-native properties or methods from interceptors and such, e.g.
       // an immutability marker. So we  had to stop doing that.
       var slot = findSlot(e);
-      var copy = JS('List|Null', '#', readSlot(slot));
+      var copy = JS('returns:List|Null;creates:;', '#', readSlot(slot));
       if (copy != null) return copy;
       copy = copyList(e, slot);
       return copy;
@@ -237,9 +237,9 @@ abstract class _AcceptStructuredClone {
     }
 
     if (isJavaScriptArray(e)) {
-      var l = JS('List', '#', e);
+      var l = JS('returns:List;creates:;', '#', e);
       var slot = findSlot(l);
-      var copy = JS('List|Null', '#', readSlot(slot));
+      var copy = JS('returns:List|Null;creates:;', '#', readSlot(slot));
       if (copy != null) return copy;
 
       int length = l.length;

tests/co19_2/co19_2-dart2js.status

@@ -84,6 +84,9 @@ abstract class DataComputer {
   /// Called before testing to setup flags needed for data collection.
   void setup() {}
 
+  /// Called before testing to setup flags needed for data collection.
+  void onCompilation(Compiler compiler) {}
+
   /// Function that computes a data mapping for [member].
   ///
   /// Fills [actualMap] with the data and [sourceSpanMap] with the source spans
@@ -149,6 +152,7 @@ Future<CompiledData> computeData(Uri entryPoint,
     Expect.isTrue(result.isSuccess, "Unexpected compilation error.");
   }
   Compiler compiler = result.compiler;
+  dataComputer.onCompilation(compiler);
   dynamic closedWorld = testFrontend
       ? compiler.resolutionWorldBuilder.closedWorldForTesting
       : compiler.backendClosedWorldForTesting;

tests/compiler/dart2js/equivalence/id_equivalence_helper.dart

@@ -66,13 +66,17 @@ show(ArgResults argResults, DataComputer dataComputer,
   } else {
     SourceFileProvider provider = data.compiler.provider;
     for (Uri uri in data.actualMaps.keys) {
-      if (show != null && !show.any((f) => '$uri'.endsWith(f))) {
+      Uri fileUri = uri;
+      if (fileUri.scheme == 'org-dartlang-sdk') {
+        fileUri = Uri.base.resolve(fileUri.path.substring(1));
+      }
+      if (show != null && !show.any((f) => '$fileUri'.endsWith(f))) {
         continue;
       }
-      SourceFile sourceFile = await provider.autoReadFromFile(uri);
+      SourceFile sourceFile = await provider.autoReadFromFile(fileUri);
       String sourceCode = sourceFile?.slowText();
       if (sourceCode == null) {
-        sourceCode = new File.fromUri(uri).readAsStringSync();
+        sourceCode = new File.fromUri(fileUri).readAsStringSync();
       }
       if (sourceCode == null) {
         print('--source code missing for $uri--------------------------------');

tests/compiler/dart2js/equivalence/show_helper.dart

@@ -0,0 +1,21 @@
+// Copyright (c) 2018, 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.
+
+// ignore: IMPORT_INTERNAL_LIBRARY
+import 'dart:_foreign_helper' as foreign show JS;
+import 'dart:html';
+
+/*element: main:[null]*/
+main() {
+  createElement();
+  createRectangle();
+}
+
+/*element: createElement:[null|subclass=Element]*/
+Element createElement()
+    // ignore: NATIVE_FUNCTION_BODY_IN_NON_SDK_CODE
+    native;
+
+/*element: createRectangle:[subclass=DomRectReadOnly]*/
+createRectangle() => foreign.JS('Rectangle', "#", null);