Reapply "Retain types of toplevel and instance variables for reflection."

sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart

 // Copyright (c) 2012, 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.
 
 part of dart2js.js_emitter;
 
 /**
  * Generates the code for all used classes in the program. Static fields (even
  * in classes) are ignored, since they can be treated as non-class elements.
  *
@@ skipping 119 matching lines @@
     const RANGE1_ADJUST = - (FIRST_FIELD_CODE - RANGE1_FIRST);
     const RANGE2_ADJUST = - (FIRST_FIELD_CODE + RANGE1_SIZE - RANGE2_FIRST);
     const RANGE3_ADJUST =
         - (FIRST_FIELD_CODE + RANGE1_SIZE + RANGE2_SIZE - RANGE3_FIRST);
 
     String receiverParamName = compiler.enableMinification ? "r" : "receiver";
     String valueParamName = compiler.enableMinification ? "v" : "value";
     String reflectableField = namer.reflectableField;
 
     // function generateAccessor(field, prototype, cls) {
-    jsAst.Fun fun = js.fun(['field', 'accessors', 'cls'], [
+    jsAst.Fun fun = js.fun(['fieldDescriptor', 'accessors', 'cls'], [
+      js('var fieldInformation = fieldDescriptor.split("-")'),
+      js('var field = fieldInformation[0]'),
       js('var len = field.length'),
       js('var code = field.charCodeAt(len - 1)'),
-      js('var reflectable = false'),
-      js.if_('code == $REFLECTION_MARKER', [
-          js('len--'),
-          js('code = field.charCodeAt(len - 1)'),
-          js('field = field.substring(0, len)'),
-          js('reflectable = true')
-      ]),
+      js('var reflectable'),
+      js.if_('fieldInformation.length > 1', js('reflectable = true'),
+             js('reflectable = false')),
       js('code = ((code >= $RANGE1_FIRST) && (code <= $RANGE1_LAST))'
           '    ? code - $RANGE1_ADJUST'
           '    : ((code >= $RANGE2_FIRST) && (code <= $RANGE2_LAST))'
           '      ? code - $RANGE2_ADJUST'
           '      : ((code >= $RANGE3_FIRST) && (code <= $RANGE3_LAST))'
           '        ? code - $RANGE3_ADJUST'
           '        : $NO_FIELD_CODE'),
 
       // if (needsAccessor) {
       js.if_('code', [
@@ skipping 1432 matching lines @@
   }
 
   bool isDeferred(Element element) {
     return compiler.deferredLoadTask.isDeferred(element);
   }
 
   bool get areAnyElementsDeferred {
     return compiler.deferredLoadTask.areAnyElementsDeferred;
   }
 }