| Index: sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart
 | 
| diff --git a/sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart b/sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart
 | 
| index 874afa9d64d903991028148b045f91b6f378f930..a1bcf0553afa6ed6bb1b02a00a4d5da3a29c47cf 100644
 | 
| --- a/sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart
 | 
| +++ b/sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart
 | 
| @@ -171,8 +171,8 @@ class CodeEmitterTask extends CompilerTask {
 | 
|          // TODO(sigurdm): We should track those constants.
 | 
|          constantUnit = compiler.deferredLoadTask.mainOutputUnit;
 | 
|        }
 | 
| -      outputConstantLists.putIfAbsent(constantUnit, () => new List<ConstantValue>())
 | 
| -          .add(constant);
 | 
| +      outputConstantLists.putIfAbsent(
 | 
| +          constantUnit, () => new List<ConstantValue>()).add(constant);
 | 
|      }
 | 
|    }
 | 
|  
 | 
| @@ -186,8 +186,8 @@ class CodeEmitterTask extends CompilerTask {
 | 
|  
 | 
|      // Compute needed classes.
 | 
|      Set<ClassElement> instantiatedClasses =
 | 
| -        compiler.codegenWorld.instantiatedClasses.where(computeClassFilter())
 | 
| -            .toSet();
 | 
| +        compiler.codegenWorld.directlyInstantiatedClasses
 | 
| +            .where(computeClassFilter()).toSet();
 | 
|  
 | 
|      void addClassWithSuperclasses(ClassElement cls) {
 | 
|        neededClasses.add(cls);
 | 
| 
 |