Split NativeDataImpl

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/backend_api.dart' show BackendSerialization;
 import '../elements/elements.dart';
 import '../elements/resolution_types.dart';
 import '../elements/types.dart';
@@ skipping 16 matching lines @@
 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;
 
-  JavaScriptBackendSerialization(NativeData nativeData)
-      : serializer = new JavaScriptBackendSerializer(nativeData),
-        deserializer = new JavaScriptBackendDeserializer(nativeData);
+  JavaScriptBackendSerialization(
+      NativeClassData nativeClassData, NativeData nativeData)
+      : serializer =
+            new JavaScriptBackendSerializer(nativeClassData, nativeData),
+        deserializer =
+            new JavaScriptBackendDeserializer(nativeClassData, nativeData);
 }
 
 const Key JS_INTEROP_LIBRARY_NAME = const Key('jsInteropLibraryName');
 const Key JS_INTEROP_CLASS_NAME = const Key('jsInteropClassName');
 const Key JS_INTEROP_MEMBER_NAME = const Key('jsInteropMemberName');
 const Key NATIVE_MEMBER_NAME = const Key('nativeMemberName');
 const Key NATIVE_CLASS_TAG_INFO = const Key('nativeClassTagInfo');
 const Key NATIVE_METHOD_BEHAVIOR = const Key('nativeMethodBehavior');
 const Key NATIVE_FIELD_LOAD_BEHAVIOR = const Key('nativeFieldLoadBehavior');
 const Key NATIVE_FIELD_STORE_BEHAVIOR = const Key('nativeFieldStoreBehavior');
 
 class JavaScriptBackendSerializer implements SerializerPlugin {
+  final NativeClassDataImpl nativeClassData;
   final NativeDataImpl nativeData;
 
-  JavaScriptBackendSerializer(this.nativeData);
+  JavaScriptBackendSerializer(this.nativeClassData, this.nativeData);
 
   @override
   void onElement(Element element, ObjectEncoder createEncoder(String tag)) {
     ObjectEncoder encoder;
     ObjectEncoder getEncoder() {
       return encoder ??= createEncoder(_BACKEND_DATA_TAG);
     }
 
     String jsInteropLibraryName = nativeData.jsInteropLibraryNames[element];
     if (jsInteropLibraryName != null) {
       getEncoder().setString(JS_INTEROP_LIBRARY_NAME, jsInteropLibraryName);
     }
     String jsInteropClassName = nativeData.jsInteropClassNames[element];
     if (jsInteropClassName != null) {
       getEncoder().setString(JS_INTEROP_CLASS_NAME, jsInteropClassName);
     }
     String jsInteropMemberName = nativeData.jsInteropMemberNames[element];
     if (jsInteropMemberName != null) {
       getEncoder().setString(JS_INTEROP_MEMBER_NAME, jsInteropMemberName);
     }
     String nativeMemberName = nativeData.nativeMemberName[element];
     if (nativeMemberName != null) {
       getEncoder().setString(NATIVE_MEMBER_NAME, nativeMemberName);
     }
-    String nativeClassTagInfo = nativeData.nativeClassTagInfo[element];
+    NativeClassTag nativeClassTagInfo =
+        nativeClassData.nativeClassTagInfo[element];
     if (nativeClassTagInfo != null) {
-      getEncoder().setString(NATIVE_CLASS_TAG_INFO, nativeClassTagInfo);
+      getEncoder().setString(NATIVE_CLASS_TAG_INFO, nativeClassTagInfo.text);
     }
     NativeBehavior nativeMethodBehavior =
         nativeData.nativeMethodBehavior[element];
     if (nativeMethodBehavior != null) {
       NativeBehaviorSerialization.serializeNativeBehavior(nativeMethodBehavior,
           getEncoder().createObject(NATIVE_METHOD_BEHAVIOR));
     }
     NativeBehavior nativeFieldLoadBehavior =
         nativeData.nativeFieldLoadBehavior[element];
     if (nativeFieldLoadBehavior != null) {
@@ skipping 10 matching lines @@
     }
   }
 
   @override
   void onData(NativeBehavior behavior, ObjectEncoder encoder) {
     NativeBehaviorSerialization.serializeNativeBehavior(behavior, encoder);
   }
 }
 
 class JavaScriptBackendDeserializer implements DeserializerPlugin {
+  final NativeClassDataImpl nativeClassData;
   final NativeDataImpl nativeData;
 
-  JavaScriptBackendDeserializer(this.nativeData);
+  JavaScriptBackendDeserializer(this.nativeClassData, this.nativeData);
 
   @override
   void onElement(Element element, ObjectDecoder getDecoder(String tag)) {
     ObjectDecoder decoder = getDecoder(_BACKEND_DATA_TAG);
     if (decoder != null) {
       if (element is LibraryElement) {
         String jsInteropLibraryName =
             decoder.getString(JS_INTEROP_LIBRARY_NAME, isOptional: true);
         if (jsInteropLibraryName != null) {
           nativeData.jsInteropLibraryNames[element] = jsInteropLibraryName;
         }
       } else if (element is ClassElement) {
         String jsInteropClassName =
             decoder.getString(JS_INTEROP_CLASS_NAME, isOptional: true);
         if (jsInteropClassName != null) {
           nativeData.jsInteropClassNames[element] = jsInteropClassName;
         }
         String nativeClassTagInfo =
             decoder.getString(NATIVE_CLASS_TAG_INFO, isOptional: true);
         if (nativeClassTagInfo != null) {
-          nativeData.nativeClassTagInfo[element] = nativeClassTagInfo;
+          nativeClassData.nativeClassTagInfo[element] =
+              new NativeClassTag(nativeClassTagInfo);
         }
       } else if (element is MemberElement) {
         String jsInteropMemberName =
             decoder.getString(JS_INTEROP_MEMBER_NAME, isOptional: true);
         if (jsInteropMemberName != null) {
           nativeData.jsInteropMemberNames[element] = jsInteropMemberName;
         }
         String nativeMemberName =
             decoder.getString(NATIVE_MEMBER_NAME, isOptional: true);
         if (nativeMemberName != null) {
@@ skipping 133 matching lines @@
       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;
   }
 }