dart2js CPS: Fix a bug in scalar replacement.

pkg/compiler/lib/src/cps_ir/scalar_replacement.dart

 // Copyright (c) 2015, 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.
 library dart2js.cps_ir.scalar_replacement;
 
 import 'optimizers.dart';
 
 import 'dart:collection' show Queue;
 
 import '../common.dart';
 import '../compiler.dart' as dart2js show
     Compiler;
 import '../constants/values.dart';
 import '../elements/elements.dart';
 import '../types/types.dart';
 import '../world.dart' show World;
 import 'cps_ir_nodes.dart';
 
 /**
  * Replaces aggregates with a set of local values.  Performs inlining of
- * single-use closures to generate more replacable aggregates.
+ * single-use closures to generate more replaceable aggregates.
  */
 class ScalarReplacer extends Pass {
   String get passName => 'Scalar replacement';
 
   final InternalErrorFunction _internalError;
   final World _classWorld;
 
   ScalarReplacer(dart2js.Compiler compiler)
       : _internalError = compiler.reporter.internalError,
         _classWorld = compiler.world;
 
   @override
   void rewrite(FunctionDefinition root) {
     ScalarReplacementVisitor analyzer =
         new ScalarReplacementVisitor(_internalError, _classWorld);
     analyzer.analyze(root);
     analyzer.process();
   }
 }
 
 /**
  * Do scalar replacement of aggregates on instances. Since scalar replacement
- * can create new candidiates, iterate until all scalar replacements are done.
+ * can create new candidates, iterate until all scalar replacements are done.
  */
 class ScalarReplacementVisitor extends TrampolineRecursiveVisitor {
 
   final InternalErrorFunction internalError;
   final World classWorld;
   ScalarReplacementRemovalVisitor removalVisitor;
 
   Primitive _current = null;
   Set<Primitive> _allocations = new Set<Primitive>();
   Queue<Primitive> _queue = new Queue<Primitive>();
@@ skipping 42 matching lines @@
     // Find the initial values of the fields. A CreateBox has no initial
     // values. CreateInstance has initial values in the order of the fields.
     Map<FieldElement, Primitive> fieldInitialValues =
         <FieldElement, Primitive>{};
     if (allocation is CreateInstance) {
       int i = 0;
       allocation.classElement.forEachInstanceField(
         (ClassElement enclosingClass, FieldElement field) {
           Primitive argument = allocation.arguments[i++].definition;
           fieldInitialValues[field] = argument;
-        });
+        },
+        includeSuperAndInjectedMembers: true);
     }
 
     // Create [MutableVariable]s for each written field. Initialize the
     // MutableVariable with the value from the allocator, or initialize with a
     // `null` constant if there is not initial value.
     Map<FieldElement, MutableVariable> cells =
         <FieldElement, MutableVariable>{};
     InteriorNode insertionPoint = allocation.parent;  // LetPrim
     for (FieldElement field in writes) {
       MutableVariable variable = new MutableVariable(field);
@@ skipping 101 matching lines @@
 class ScalarReplacementRemovalVisitor extends TrampolineRecursiveVisitor {
   ScalarReplacementVisitor process;
 
   ScalarReplacementRemovalVisitor(this.process);
 
   processReference(Reference reference) {
     process.reconsider(reference.definition);
     reference.unlink();
   }
 }