Do not include names of lazy globals in minified 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 522 matching lines @@
 
   jsAst.Expression buildLazilyInitializedStaticField(
       VariableElement element, {String isolateProperties}) {
     jsAst.Expression code = backend.generatedCode[element];
     // The code is null if we ended up not needing the lazily
     // initialized field after all because of constant folding
     // before code generation.
     if (code == null) return null;
     // The code only computes the initial value. We build the lazy-check
     // here:
-    //   lazyInitializer(prototype, 'name', fieldName, getterName, initial);
+    //   lazyInitializer(fieldName, getterName, initial, name, prototype);
     // The name is used for error reporting. The 'initial' must be a
     // closure that constructs the initial value.
     if (isolateProperties != null) {
+      // This is currently only used in incremental compilation to patch
+      // in new lazy values.
       return js('#(#,#,#,#,#)',
           [js(lazyInitializerName),
-           js.string(element.name),
            js.string(namer.globalPropertyName(element)),
            js.string(namer.lazyInitializerName(element)),
            code,
+           js.string(element.name),
            isolateProperties]);
     }
 
-    return js('#(#,#,#,#)',
-        [js(lazyInitializerName),
-         js.string(element.name),
-         js.string(namer.globalPropertyName(element)),
-         js.string(namer.lazyInitializerName(element)),
-         code]);
+    if (compiler.enableMinification) {
+      return js('#(#,#,#)',
+          [js(lazyInitializerName),
+              js.string(namer.globalPropertyName(element)),
+              js.string(namer.lazyInitializerName(element)),
+              code]);
+    } else {
+      return js('#(#,#,#,#)',
+          [js(lazyInitializerName),
+              js.string(namer.globalPropertyName(element)),
+              js.string(namer.lazyInitializerName(element)),
+              code,
+              js.string(element.name)]);
+    }
   }
 
   void emitMetadata(Program program, CodeOutput output) {
 
    addMetadataGlobal(List<String> list, String global) {
      String globalAccess = generateEmbeddedGlobalAccessString(global);
      output.add('$globalAccess$_=$_[');
      for (String data in list) {
        if (data is String) {
          if (data != 'null') {
@@ skipping 121 matching lines @@
     jsAst.FunctionDeclaration decl = js.statement('''
       function init() {
         $isolateProperties = Object.create(null);
         #allClasses = Object.create(null);
         #getTypeFromName = function(name) {return #allClasses[name];};
         #interceptorsByTag = Object.create(null);
         #leafTags = Object.create(null);
         #finishedClasses = Object.create(null);
 
         if (#needsLazyInitializer) {
-          $lazyInitializerName = function (staticName, fieldName, getterName,
-                                           lazyValue, prototype) {
+          // [staticName] is only provided in non-minified mode. If missing, we 
+          // fall back to [fieldName]. Likewise, [prototype] is optional and 
+          // defaults to the isolateProperties object.
+          $lazyInitializerName = function (fieldName, getterName, lazyValue,
+                                           staticName, prototype) {
             if (!#lazies) #lazies = Object.create(null);
             #lazies[fieldName] = getterName;
 
             // 'prototype' will be undefined except if we are doing an update
             // during incremental compilation. In this case we put the lazy
             // field directly on the isolate instead of the isolateProperties.
             prototype = prototype || $isolateProperties;
             var sentinelUndefined = {};
             var sentinelInProgress = {};
             prototype[fieldName] = sentinelUndefined;
 
             prototype[getterName] = function () {
               var result = this[fieldName];
               try {
                 if (result === sentinelUndefined) {
                   this[fieldName] = sentinelInProgress;
 
                   try {
                     result = this[fieldName] = lazyValue();
                   } finally {
                     // Use try-finally, not try-catch/throw as it destroys the
                     // stack trace.
                     if (result === sentinelUndefined)
                       this[fieldName] = null;
                   }
                 } else {
                   if (result === sentinelInProgress)
-                    #cyclicThrow(staticName);
+                    // In minified mode, static name might not have been
+                    // provided, so fall back to the minified fieldName.
+                    #cyclicThrow(staticName || fieldName);
                 }
 
                 return result;
               } finally {
                 this[getterName] = function() { return this[fieldName]; };
               }
             }
           }
         }
 
@@ skipping 1065 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }