Index: runtime/vm/parser.cc |
diff --git a/runtime/vm/parser.cc b/runtime/vm/parser.cc |
index 79a786af2b014e651eff49a4774195cbf8d05521..fb2259d43c602c584f9b27ee27b32a94a445a857 100644 |
--- a/runtime/vm/parser.cc |
+++ b/runtime/vm/parser.cc |
@@ -2348,7 +2348,7 @@ void Parser::GenerateSuperConstructorCall(const Class& cls, |
return; |
} |
String& super_ctor_name = String::Handle(Z, super_class.Name()); |
- super_ctor_name = String::Concat(super_ctor_name, Symbols::Dot()); |
+ super_ctor_name = Symbols::FromConcat(super_ctor_name, Symbols::Dot()); |
ArgumentListNode* arguments = new ArgumentListNode(supercall_pos); |
// Implicit 'this' parameter is the first argument. |
@@ -2409,11 +2409,11 @@ AstNode* Parser::ParseSuperInitializer(const Class& cls, |
const Class& super_class = Class::Handle(Z, cls.SuperClass()); |
ASSERT(!super_class.IsNull()); |
String& ctor_name = String::Handle(Z, super_class.Name()); |
- ctor_name = String::Concat(ctor_name, Symbols::Dot()); |
+ ctor_name = Symbols::FromConcat(ctor_name, Symbols::Dot()); |
if (CurrentToken() == Token::kPERIOD) { |
ConsumeToken(); |
- ctor_name = String::Concat(ctor_name, |
- *ExpectIdentifier("constructor name expected")); |
+ ctor_name = Symbols::FromConcat( |
+ ctor_name, *ExpectIdentifier("constructor name expected")); |
} |
CheckToken(Token::kLPAREN, "parameter list expected"); |
@@ -5210,7 +5210,7 @@ void Parser::SkipType(bool allow_void) { |
void Parser::ParseTypeParameters(const Class& cls) { |
TRACE_PARSER("ParseTypeParameters"); |
if (CurrentToken() == Token::kLT) { |
- GrowableArray<AbstractType*> type_parameters_array; |
+ GrowableArray<AbstractType*> type_parameters_array(Z, 2); |
intptr_t index = 0; |
TypeParameter& type_parameter = TypeParameter::Handle(Z); |
TypeParameter& existing_type_parameter = TypeParameter::Handle(Z); |