Fix reparsing of function parameters that include type parameters.

tests/lib/mirrors/parameter_test.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.
 
 /// Test of [ParameterMirror].
 library test.parameter_test;
 
 @MirrorsUsed(targets: 'test.parameter_test', override: '*')
 import 'dart:mirrors';
 
@@ skipping 13 matching lines @@
 
   var _x;
   get x =>  _x;
   set x(final value) { _x = value; }
 
   grault([int x]);
   garply({int y});
   waldo(int z);
 }
 
+class C <S extends int, T> {
+  // TODO(6490): Currently only supported by the VM.
+  foo(int a, S b) => b;
+  bar(S a, T b, num c) {}
+}
+
 main() {
   ClassMirror cm = reflectClass(B);
   Map<Symbol, MethodMirror> constructors = cm.constructors;
 
   List<Symbol> constructorKeys = [
       const Symbol('B'), const Symbol('B.bar'), const Symbol('B.baz'),
       const Symbol('B.foo'), const Symbol('B.quux'), const Symbol('B.qux'),
       const Symbol('B.corge')];
   Expect.setEquals(constructorKeys, constructors.keys);
 
@@ skipping 90 matching lines @@
          ' type = Class(s(int) in s(dart.core), top-level))]',
          garply.parameters);
   expect('Instance(value = <null>)', garply.parameters[0].defaultValue);
 
   MethodMirror waldo = cm.members[const Symbol("waldo")];
   expect('Method(s(waldo) in s(B))', waldo);
   expect('[Parameter(s(z) in s(waldo),' 
          ' type = Class(s(int) in s(dart.core), top-level))]',
          waldo.parameters);
   expect('<null>', waldo.parameters[0].defaultValue);
+
+  cm = reflectClass(C);
+
+  MethodMirror fooInC = cm.members[const Symbol("foo")];
+  expect('Method(s(foo) in s(C))', fooInC);
+  expect('[Parameter(s(a) in s(foo),'
+         ' type = Class(s(int) in s(dart.core), top-level)), '
+         'Parameter(s(b) in s(foo),'
+         ' type = TypeVariable(s(S) in s(C),'
+         ' upperBound = Class(s(int) in s(dart.core), top-level)))]',
+         fooInC.parameters);
+
+  MethodMirror barInC = cm.members[const Symbol("bar")];
+  expect('Method(s(bar) in s(C))', barInC);
+  expect('[Parameter(s(a) in s(bar),'
+         ' type = TypeVariable(s(S) in s(C),'
+         ' upperBound = Class(s(int) in s(dart.core), top-level))), '
+         'Parameter(s(b) in s(bar),'
+         ' type = TypeVariable(s(T) in s(C),'
+         ' upperBound = Class(s(Object) in s(dart.core), top-level))), '
+         'Parameter(s(c) in s(bar),'
+         ' type = Class(s(num) in s(dart.core), top-level))]',
+         barInC.parameters);
 }