Remove conflict between type parameter and method/field from typevariable_mirror_metadata_test. Rem…

runtime/vm/object.cc

 // 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.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 6997 matching lines @@
 static RawString* MakeFunctionMetaName(const Function& func) {
   const String& cname =
       String::Handle(MakeClassMetaName(Class::Handle(func.origin())));
   String& fname = String::Handle(func.name());
   fname = String::Concat(Symbols::At(), fname);
   return String::Concat(cname, fname);
 }
 
 
 static RawString* MakeTypeParameterMetaName(const TypeParameter& param) {
-  const Array& parts = Array::Handle(Array::New(3));
-  String& part = String::Handle();
-  part ^= MakeClassMetaName(Class::Handle(param.parameterized_class()));
-  parts.SetAt(0, part);
-  // We need to choose something different from field/function names, because it
-  // is allowed to have type parameters and fields/functions with the same name
-  // in a class.
-  parts.SetAt(1, Symbols::Slash());
-  part ^= param.name();
-  parts.SetAt(2, part);
-  return String::ConcatAll(parts);
+  const String& cname = String::Handle(
+      MakeClassMetaName(Class::Handle(param.parameterized_class())));
+  String& pname = String::Handle(param.name());
+  pname = String::Concat(Symbols::At(), pname);
+  return String::Concat(cname, pname);
 }
 
 
 void Library::AddMetadata(const Class& cls,
                           const String& name,
                           intptr_t token_pos) const {
   const String& metaname = String::Handle(Symbols::New(name));
   Field& field = Field::Handle(Field::New(metaname,
                                           true,   // is_static
                                           false,  // is_final
@@ skipping 8526 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
 }  // namespace dart