Make sure the SSA codegen visit constants used in a switch through the 'visitConstant' method, to e…

sdk/lib/_internal/compiler/implementation/ssa/codegen.dart

 // Copyright (c) 2012, 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 ssa;
 
 class SsaCodeGeneratorTask extends CompilerTask {
 
   final JavaScriptBackend backend;
 
@@ skipping 657 matching lines @@
       generateStatements(info.expression);
     }
 
     if (isExpression) {
       push(generateExpression(info.expression));
     } else {
       use(info.expression.conditionExpression);
     }
     js.Expression key = pop();
     List<js.SwitchClause> cases = <js.SwitchClause>[];
+    HSwitch switchInstruction = info.expression.end.last;
+    List<HInstruction> inputs = switchInstruction.inputs;
+    List<HBasicBlock> successors = switchInstruction.block.successors;
 
     js.Block oldContainer = currentContainer;
-    for (int i = 0; i < info.matchExpressions.length; i++) {
-      for (Constant constant in info.matchExpressions[i]) {
-        generateConstant(constant);
+    for (int inputIndex = 1, statementIndex = 0;
+         inputIndex < inputs.length;
+         statementIndex++) {
+      HBasicBlock successor = successors[inputIndex - 1];
+      do {
+        visit(inputs[inputIndex]);
         currentContainer = new js.Block.empty();
         cases.add(new js.Case(pop(), currentContainer));
-      }
-      if (i == info.matchExpressions.length - 1) {
-        currentContainer = new js.Block.empty();
-        cases.add(new js.Default(currentContainer));
-      }
-      generateStatements(info.statements[i]);
+        inputIndex++;
+      } while ((successors[inputIndex - 1] == successor)
+               && (inputIndex < inputs.length));
+
+      generateStatements(info.statements[statementIndex]);
     }
+
+    currentContainer = new js.Block.empty();
+    cases.add(new js.Default(currentContainer));
+    generateStatements(info.statements.last);
+
     currentContainer = oldContainer;
 
     js.Statement result = new js.Switch(key, cases);
     pushStatement(wrapIntoLabels(result, info.labels));
     return true;
   }
 
   bool visitSequenceInfo(HStatementSequenceInformation info) {
     return false;
   }
@@ skipping 1856 matching lines @@
     if (left.isConstantNull() || right.isConstantNull() ||
         (left.isPrimitive(compiler) &&
          left.instructionType == right.instructionType)) {
       return '==';
     }
     return null;
   } else {
     return '===';
   }
 }