Fix runtimeType.toString for tear-offs.

pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart

 // Copyright (c) 2014, 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;
 
 
 class OldEmitter implements Emitter {
   final Compiler compiler;
   final CodeEmitterTask task;
@@ skipping 259 matching lines @@
             typeAccess(compiler.objectClass));
 
       case JsBuiltin.isCheckPropertyToJsConstructorName:
         int isPrefixLength = namer.operatorIsPrefix.length;
         return jsAst.js.expressionTemplateFor('#.substring($isPrefixLength)');
 
       case JsBuiltin.isFunctionType:
         return backend.rti.representationGenerator.templateForIsFunctionType;
 
       case JsBuiltin.rawRtiToJsConstructorName:
-        return jsAst.js.expressionTemplateFor("#.$typeNameProperty");
+        return jsAst.js.expressionTemplateFor("#.name");
 
       case JsBuiltin.rawRuntimeType:
         return jsAst.js.expressionTemplateFor("#.constructor");
 
       case JsBuiltin.createFunctionTypeRti:
         return backend.rti.representationGenerator
             .templateForCreateFunctionType;
 
       case JsBuiltin.isSubtype:
         // TODO(floitsch): move this closer to where is-check properties are
         // built.
         String isPrefix = namer.operatorIsPrefix;
         return jsAst.js.expressionTemplateFor(
             "('$isPrefix' + #) in #.prototype");
 
       case JsBuiltin.isFunctionTypeRti:
         String functionClassName =
             backend.namer.runtimeTypeName(compiler.functionClass);
         return jsAst.js.expressionTemplateFor(
-            '#.$typeNameProperty === "$functionClassName"');
+            '#.name === "$functionClassName"');
 
       case JsBuiltin.isDartObjectTypeRti:
         String objectClassName =
             backend.namer.runtimeTypeName(compiler.objectClass);
         return jsAst.js.expressionTemplateFor(
-            '#.$typeNameProperty === "$objectClassName"');
+            '#.name === "$objectClassName"');
 
       case JsBuiltin.isNullTypeRti:
         String nullClassName =
             backend.namer.runtimeTypeName(compiler.nullClass);
         return jsAst.js.expressionTemplateFor(
-            '#.$typeNameProperty === "$nullClassName"');
+            '#.name === "$nullClassName"');
 
       case JsBuiltin.getMetadata:
         String metadataAccess =
             generateEmbeddedGlobalAccessString(embeddedNames.METADATA);
         return jsAst.js.expressionTemplateFor("$metadataAccess[#]");
 
       case JsBuiltin.getType:
         String typesAccess =
             generateEmbeddedGlobalAccessString(embeddedNames.TYPES);
         return jsAst.js.expressionTemplateFor("$typesAccess[#]");
@@ skipping 708 matching lines @@
         new jsAst.FunctionDeclaration(
             new jsAst.VariableDeclaration(constructorName), constructorAst));
 
     String fieldNamesProperty = FIELD_NAMES_PROPERTY_NAME;
     bool hasIsolateSupport = compiler.hasIsolateSupport;
     jsAst.Node fieldNamesArray =
         hasIsolateSupport ? js.stringArray(fields) : new jsAst.LiteralNull();
 
     cspPrecompiledFunctionFor(outputUnit).add(js.statement(r'''
         {
-          #constructorName.#typeNameProperty = #constructorNameString;
-          // IE does not have a name property.
-          if (!("name" in #constructorName))
-              #constructorName.name = #constructorNameString;
+          if (typeof #constructorName.name != 'string') {

[sra1, 2015/06/26 23:10:09]

ditto double quotw

[floitsch, 2015/07/01 17:00:14]

Done.

+            // IE does not store the name, but allows to modify the property.
+            #constructorName.name = #constructorNameString;
+          }
           $desc = $collectedClasses$.#constructorName[1];
           #constructorName.prototype = $desc;
           ''' /* next string is not a raw string */ '''
           if (#hasIsolateSupport) {
             #constructorName.$fieldNamesProperty = #fieldNamesArray;
           }
         }''',
         {"constructorName": constructorName,
-         "typeNameProperty": typeNameProperty,
          "constructorNameString": js.string(constructorName),
          "hasIsolateSupport": hasIsolateSupport,
          "fieldNamesArray": fieldNamesArray}));
 
     cspPrecompiledConstructorNamesFor(outputUnit).add(js('#', constructorName));
   }
 
   void assembleTypedefs(Program program) {
     Fragment mainFragment = program.mainFragment;
     OutputUnit mainOutputUnit = mainFragment.outputUnit;
@@ skipping 938 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }