Serialize this-types in NativeBehavior separately.

pkg/compiler/lib/src/js_backend/backend_serialization.dart

 // Copyright (c) 2016, 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.
 
 library js_backend.serialization;
 
 import '../common.dart';
 import '../common/backend_api.dart' show BackendSerialization;
 import '../dart_types.dart';
 import '../elements/elements.dart';
 import '../js/js.dart' as js;
 import '../native/native.dart';
 import '../serialization/serialization.dart'
     show DeserializerPlugin, ObjectDecoder, ObjectEncoder, SerializerPlugin;
 import '../serialization/keys.dart';
 import '../universe/side_effects.dart';
 import 'js_backend.dart';
 
 const String _BACKEND_DATA_TAG = 'jsBackendData';
 const Key DART_TYPES_RETURNED = const Key('dartTypesReturned');
+const Key THIS_TYPES_RETURNED = const Key('thisTypesReturned');
 const Key SPECIAL_TYPES_RETURNED = const Key('specialTypesReturned');
 const Key DART_TYPES_INSTANTIATED = const Key('dartTypesInstantiated');
+const Key THIS_TYPES_INSTANTIATED = const Key('thisTypesInstantiated');
 const Key SPECIAL_TYPES_INSTANTIATED = const Key('specialTypesInstantiated');
 const Key CODE_TEMPLATE = const Key('codeTemplate');
 const Key SIDE_EFFECTS = const Key('sideEffects');
 const Key THROW_BEHAVIOR = const Key('throwBehavior');
 const Key IS_ALLOCATION = const Key('isAllocation');
 const Key USE_GVN = const Key('useGvn');
 
 class JavaScriptBackendSerialization implements BackendSerialization {
   final JavaScriptBackendSerializer serializer;
   final JavaScriptBackendDeserializer deserializer;
@@ skipping 110 matching lines @@
     }
   }
 
   @override
   NativeBehavior onData(ObjectDecoder decoder) {
     return NativeBehaviorSerialization.deserializeNativeBehavior(decoder);
   }
 }
 
 class NativeBehaviorSerialization {
-  /// Returns a list of the [DartType]s in [types].
+  /// Returns a list of the non-this-type [DartType]s in [types].
   static List<DartType> filterDartTypes(List types) {
-    return types.where((type) => type is DartType).toList();
+    return types.where((type) {
+      if (type is DartType) {
+        // TODO(johnniwinther): Remove this when annotation are no longer resolved

[Harry Terkelsen, 2016/07/15 16:03:10]

nit: long line

[Johnni Winther, 2016/07/18 10:44:17]

Done.

+        // to this-types.
+        if (type is GenericType &&
+            type.isGeneric &&
+            type == type.element.thisType) {
+          return false;
+        }
+        return true;
+      }
+      return false;
+    }).toList();
+  }
+
+  // TODO(johnniwinther): Remove this when annotation are no longer resolved
+  // to this-types.
+  /// Returns a list of the classes of this-types in [types].
+  static List<Element> filterThisTypes(List types) {
+    return types.where((type) {

[Harry Terkelsen, 2016/07/15 16:03:10]

maybe move this filter function to it's own local method so you can do
types.where(isThisType) above and types.where((x) => !isThisType(x)) here

[Johnni Winther, 2016/07/18 10:44:17]

Done.

+      if (type is DartType) {
+        if (type is GenericType &&
+            type.isGeneric &&
+            type == type.element.thisType) {
+          return true;
+        }
+      }
+      return false;
+    }).map((type) {
+      return type.element;
+    }).toList();
   }
 
   /// Returns a list of the names of the [SpecialType]s in [types].
   static List<String> filterSpecialTypes(List types) {
     return types
         .where((type) => type is SpecialType)
         .map((SpecialType type) => type.name)
         .toList();
   }
 
   static void serializeNativeBehavior(
       NativeBehavior behavior, ObjectEncoder encoder) {
     encoder.setTypes(
         DART_TYPES_RETURNED, filterDartTypes(behavior.typesReturned));
+    encoder.setElements(
+        THIS_TYPES_RETURNED, filterThisTypes(behavior.typesReturned));
     encoder.setStrings(
         SPECIAL_TYPES_RETURNED, filterSpecialTypes(behavior.typesReturned));
 
     encoder.setTypes(
         DART_TYPES_INSTANTIATED, filterDartTypes(behavior.typesInstantiated));
+    encoder.setElements(
+        THIS_TYPES_INSTANTIATED, filterThisTypes(behavior.typesInstantiated));
     encoder.setStrings(SPECIAL_TYPES_INSTANTIATED,
         filterSpecialTypes(behavior.typesInstantiated));
 
     if (behavior.codeTemplateText != null) {
       encoder.setString(CODE_TEMPLATE, behavior.codeTemplateText);
     }
 
     encoder.setInt(SIDE_EFFECTS, behavior.sideEffects.flags);
     encoder.setEnum(THROW_BEHAVIOR, behavior.throwBehavior);
     encoder.setBool(IS_ALLOCATION, behavior.isAllocation);
     encoder.setBool(USE_GVN, behavior.useGvn);
   }
 
   static NativeBehavior deserializeNativeBehavior(ObjectDecoder decoder) {
     SideEffects sideEffects =
         new SideEffects.fromFlags(decoder.getInt(SIDE_EFFECTS));
     NativeBehavior behavior = new NativeBehavior.internal(sideEffects);
 
     behavior.typesReturned
         .addAll(decoder.getTypes(DART_TYPES_RETURNED, isOptional: true));
     behavior.typesReturned.addAll(decoder
+        .getElements(THIS_TYPES_RETURNED, isOptional: true)
+        .map((element) => element.thisType)
+        .toList());
+    behavior.typesReturned.addAll(decoder
         .getStrings(SPECIAL_TYPES_RETURNED, isOptional: true)
         .map(SpecialType.fromName));
 
     behavior.typesInstantiated
         .addAll(decoder.getTypes(DART_TYPES_INSTANTIATED, isOptional: true));
     behavior.typesInstantiated.addAll(decoder
+        .getElements(THIS_TYPES_INSTANTIATED, isOptional: true)
+        .map((element) => element.thisType)
+        .toList());
+    behavior.typesInstantiated.addAll(decoder
         .getStrings(SPECIAL_TYPES_INSTANTIATED, isOptional: true)
         .map(SpecialType.fromName));
 
     behavior.codeTemplateText =
         decoder.getString(CODE_TEMPLATE, isOptional: true);
     if (behavior.codeTemplateText != null) {
       behavior.codeTemplate = js.js.parseForeignJS(behavior.codeTemplateText);
     }
 
     behavior.throwBehavior =
         decoder.getEnum(THROW_BEHAVIOR, NativeThrowBehavior.values);
     behavior.isAllocation = decoder.getBool(IS_ALLOCATION);
     behavior.useGvn = decoder.getBool(USE_GVN);
     return behavior;
   }
 }