dart2js: Fix emitting in csp mode.

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 459 matching lines @@
   }
 
   jsAst.Statement buildCspPrecompiledFunctionFor(
       OutputUnit outputUnit) {
     if (compiler.useContentSecurityPolicy) {
       // TODO(ahe): Compute a hash code.
       // TODO(sigurdm): Avoid this precompiled function. Generated
       // constructor-functions and getter/setter functions can be stored in the
       // library-description table. Setting properties on these can be moved to
       // finishClasses.
-      return js.statement('''
-        # = function (\$collectedClasses) {
-          var \$desc;
-          #;
-          return #;
-        };''',
-          [generateEmbeddedGlobalAccess(embeddedNames.PRECOMPILED),
-           cspPrecompiledFunctionFor(outputUnit),
-           new jsAst.ArrayInitializer(
-               cspPrecompiledConstructorNamesFor(outputUnit))]);
+      return js.statement(r"""
+        #precompiled = function ($collectedClasses$) {
+          #norename;
+          var $desc;
+          #functions;
+          return #result;
+        };""",
+        {'norename': new jsAst.Comment("// ::norenaming:: "),
+         'precompiled': generateEmbeddedGlobalAccess(embeddedNames.PRECOMPILED),
+         'functions': cspPrecompiledFunctionFor(outputUnit),
+         'result': new jsAst.ArrayInitializer(
+               cspPrecompiledConstructorNamesFor(outputUnit))});
     } else {
       return js.comment("Constructors are generated at runtime.");
     }
   }
 
   void assembleClass(Class cls, ClassBuilder enclosingBuilder,
                      Fragment fragment) {
     ClassElement classElement = cls.element;
     compiler.withCurrentElement(classElement, () {
       if (compiler.hasIncrementalSupport) {
@@ skipping 537 matching lines @@
     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;
           if (!"name" in #constructorName)
               #constructorName.name = #constructorNameString;
-          $desc = $collectedClasses.#constructorName[1];
+          $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,
@@ skipping 323 matching lines @@
        if (#isProgramSplit) {
          #globalsHolder.#isolateName = #isolateName;
          #globalsHolder.#initName = #initName;
          #globalsHolder.#setupProgramName = #setupProgramName;
        }
 
        init();
 
        #mangledNames;
 
+       #cspPrecompiledFunctions;
+
        #setupProgram;
 
        #functionThatReturnsNull;
 
        // The argument to reflectionDataParser is assigned to a temporary 'dart'
        // so that 'dart.' will appear as the prefix to dart methods in stack
        // traces and profile entries.
        var dart = #descriptors;
 
        #setupProgramName(dart, 0);
 
-       #cspPrecompiledFunctions;
-
        #getInterceptorMethods;
        #oneShotInterceptors;
 
        #makeConstantList;
 
        // We abuse the short name used for the isolate here to store
        // the isolate properties. This is safe as long as the real isolate
        // object does not exist yet.
        var ${namer.currentIsolate} = #isolatePropertiesName;
 
@@ skipping 549 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }