Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(912)

Unified Diff: runtime/vm/object.cc

Issue 27525007: Remove conflict between type parameter and method/field from typevariable_mirror_metadata_test. Rem… (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/lib/lib.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index 07356ca448b81d73bf485b9ddb09a43881500493..b07367953b599ce7bdc64c7de24248e371ddbbb9 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -7015,17 +7015,11 @@ static RawString* MakeFunctionMetaName(const Function& func) {
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);
}
« no previous file with comments | « no previous file | tests/lib/lib.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698