Revert "Revert "dart2js: Add a type parameter to class Reference....""

tests/compiler/dart2js/backend_dart/opt_redundant_phi_test.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.
 
 import 'sexpr_unstringifier.dart';
 import "package:expect/expect.dart";
 import 'package:compiler/src/cps_ir/cps_ir_nodes.dart';
 import 'package:compiler/src/cps_ir/cps_ir_nodes_sexpr.dart';
 import 'package:compiler/src/cps_ir/optimizers.dart';
 
@@ skipping 174 matching lines @@
   (LetPrim v0 (Constant IntConstant(0)))
   (LetCont (k0)
     (InvokeStatic print v0 return))
   (LetPrim v1 (Constant NullConstant))
   (InvokeContinuation k0 ))
 """;
 
 // Ensures that continuations which are never invoked are not optimized.
 // IR written by hand.
 
-String NEVER_INVOKED1_IN = """
+String NEVER_INVOKED_IN = """
 (FunctionDefinition main ( return)
   (LetPrim v0 (Constant IntConstant(0)))
   (LetCont (k0 v1)
     (InvokeStatic print v1 return))
   (InvokeContinuation return v0))
 """;
 
-String NEVER_INVOKED1_OUT = NEVER_INVOKED1_IN;
-
-// As in the previous test, except with the added wrinkle of higher order
-// continuations.
-
-String NEVER_INVOKED2_IN = """
-(FunctionDefinition main ( return)
-  (LetCont (k0 v0)
-    (InvokeStatic print v0 return))
-  (InvokeContinuation return k0))
-""";
-
-String NEVER_INVOKED2_OUT = NEVER_INVOKED2_IN;
-
-// As in the previous test, but the continuation is invoked as well as passed
-// as an argument.
-
-String AS_ARG_IN = """
-(FunctionDefinition main ( return)
-  (LetCont (k0 v0)
-    (InvokeStatic print v0 return))
-  (InvokeContinuation k0 k0))
-""";
-
-String AS_ARG_OUT = AS_ARG_IN;
+String NEVER_INVOKED_OUT = NEVER_INVOKED_IN;
 
 /// Normalizes whitespace by replacing all whitespace sequences by a single
 /// space and trimming leading and trailing whitespace.
 String normalizeSExpr(String input) {
   return input.replaceAll(new RegExp(r'[ \n\t]+'), ' ').trim();
 }
 
 /// Parses the given input IR, runs a redundant phi pass over it, and compares
 /// the stringification of the result against the expected output.
 void testRedundantPhi(String input, String expectedOutput) {
   final unstringifier = new SExpressionUnstringifier();
   final stringifier   = new SExpressionStringifier();
   final optimizer     = new RedundantPhiEliminator();
 
   FunctionDefinition f = unstringifier.unstringify(input);
   optimizer.rewrite(f);
 
   String expected = normalizeSExpr(expectedOutput);
   String actual   = normalizeSExpr(stringifier.visit(f));
 
   Expect.equals(expected, actual, "Actual:\n$actual");
 }
 
 void main() {
   testRedundantPhi(READ_IN_LOOP_IN, READ_IN_LOOP_OUT);
   testRedundantPhi(INNER_LOOP_IN, INNER_LOOP_OUT);
   testRedundantPhi(BASIC_LOOP_IN, BASIC_LOOP_OUT);
   testRedundantPhi(SCOPING_IN, SCOPING_OUT);
-  testRedundantPhi(NEVER_INVOKED1_IN, NEVER_INVOKED1_OUT);
-  testRedundantPhi(NEVER_INVOKED2_IN, NEVER_INVOKED2_OUT);
-  testRedundantPhi(AS_ARG_IN, AS_ARG_OUT);
+  testRedundantPhi(NEVER_INVOKED_IN, NEVER_INVOKED_OUT);
 }