Revert "dart2js OldEmitter: inline FinishClasses."

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

 // Copyright (c) 2013, 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 NsmEmitter extends CodeEmitterHelper {
   final List<Selector> trivialNsmHandlers = <Selector>[];
 
   /// If this is true then we can generate the noSuchMethod handlers at startup
@@ skipping 268 matching lines @@
     // Startup code that loops over the method names and puts handlers on the
     // Object class to catch noSuchMethod invocations.
     ClassElement objectClass = compiler.objectClass;
     jsAst.Expression createInvocationMirror = backend.emitter
         .staticFunctionAccess(backend.getCreateInvocationMirror());
     String noSuchMethodName = namer.publicInstanceMethodNameByArity(
         Compiler.NO_SUCH_METHOD, Compiler.NO_SUCH_METHOD_ARG_COUNT);
     var type = 0;
     if (useDiffEncoding) {
       statements.add(js.statement('''{
-          var objectClassObject = processedClasses.collected[#objectClass],
+          var objectClassObject = collectedClasses[#objectClass],
               shortNames = #diffEncoding.split(","),
               nameNumber = 0,
               diffEncodedString = shortNames[0],
               calculatedShortNames = [0, 1];    // 0, 1 are args for splice.
           // If we are loading a deferred library the object class will not be in
           // the collectedClasses so objectClassObject is undefined, and we skip
           // setting up the names.
 
           if (objectClassObject) {
             if (objectClassObject instanceof Array)
@@ skipping 24 matching lines @@
             }
             shortNames.splice.apply(shortNames, calculatedShortNames);
           }
         }''', {'objectClass': js.string(namer.getNameOfClass(objectClass)),
                'diffEncoding': js.string('$diffEncoding')}));
     } else {
       // No useDiffEncoding version.
       Iterable<String> longs = trivialNsmHandlers.map((selector) =>
              selector.invocationMirrorMemberName);
       statements.add(js.statement(
-          'var objectClassObject = processedClasses.collected[#objectClass],'
+          'var objectClassObject = collectedClasses[#objectClass],'
           '    shortNames = #diffEncoding.split(",")',
           {'objectClass': js.string(namer.getNameOfClass(objectClass)),
            'diffEncoding': js.string('$diffEncoding')}));
       if (!minify) {
         statements.add(js.statement('var longNames = #longs.split(",")',
                 {'longs': js.string(longs.join(','))}));
       }
       statements.add(js.statement(
           'if (objectClassObject instanceof Array)'
           '  objectClassObject = objectClassObject[1];'));
@@ skipping 42 matching lines @@
       }''', {
           'sliceOffsetParams': sliceOffsetParams,
           'noSuchMethodName': noSuchMethodName,
           'createInvocationMirror': createInvocationMirror,
           'names': minify ? 'shortNames' : 'longNames',
           'sliceOffsetArguments': sliceOffsetArguments}));
 
     return statements;
   }
 }