- Refactor Symbol allocation to expect a thread parameter.

runtime/vm/exceptions.cc

 // Copyright (c) 2011, 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/exceptions.h"
 
 #include "platform/address_sanitizer.h"
 
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 402 matching lines @@
   const Function& caller = Function::Handle(caller_frame->LookupDartFunction());
   ASSERT(!caller.IsNull());
   return caller.script();
 }
 
 
 // Allocate a new instance of the given class name.
 // TODO(hausner): Rename this NewCoreInstance to call out the fact that
 // the class name is resolved in the core library implicitly?
 RawInstance* Exceptions::NewInstance(const char* class_name) {
-  const String& cls_name = String::Handle(Symbols::New(class_name));
+  Thread* thread = Thread::Current();
+  Zone* zone = thread->zone();
+  const String& cls_name = String::Handle(zone,
+                                          Symbols::New(thread, class_name));
   const Library& core_lib = Library::Handle(Library::CoreLibrary());
   // No ambiguity error expected: passing NULL.
   Class& cls = Class::Handle(core_lib.LookupClass(cls_name));
   ASSERT(!cls.IsNull());
   // There are no parameterized error types, so no need to set type arguments.
   return Instance::New(cls);
 }
 
 
 // Allocate, initialize, and throw a TypeError or CastError.
@@ skipping 19 matching lines @@
     script.GetTokenLocation(location, &line, &column);
   } else {
     script.GetTokenLocation(location, &line, NULL);
   }
   // Initialize '_url', '_line', and '_column' arguments.
   args.SetAt(0, String::Handle(zone, script.url()));
   args.SetAt(1, Smi::Handle(zone, Smi::New(line)));
   args.SetAt(2, Smi::Handle(zone, Smi::New(column)));
 
   // Construct '_errorMsg'.
-  GrowableHandlePtrArray<const String> pieces(zone, 20);
+  const GrowableObjectArray& pieces = GrowableObjectArray::Handle(zone,
+      GrowableObjectArray::New(20));
 
   // Print bound error first, if any.
   if (!bound_error_msg.IsNull() && (bound_error_msg.Length() > 0)) {
     pieces.Add(bound_error_msg);
     pieces.Add(Symbols::NewLine());
   }
 
   // If dst_type is malformed or malbounded, only print the embedded error.
   if (!dst_type.IsNull()) {
     const LanguageError& error = LanguageError::Handle(zone, dst_type.error());
     if (!error.IsNull()) {
       // Print the embedded error only.
-      pieces.Add(String::Handle(zone, Symbols::New(error.ToErrorCString())));
+      pieces.Add(String::Handle(zone, String::New(error.ToErrorCString())));
       pieces.Add(Symbols::NewLine());
     } else {
       // Describe the type error.
       if (!src_type.IsNull()) {
         pieces.Add(Symbols::TypeQuote());
         pieces.Add(String::Handle(zone, src_type.UserVisibleName()));
         pieces.Add(Symbols::QuoteIsNotASubtypeOf());
       }
       pieces.Add(Symbols::TypeQuote());
       pieces.Add(String::Handle(zone, dst_type.UserVisibleName()));
@@ skipping 21 matching lines @@
         const String& uris = String::Handle(zone, dst_type.EnumerateURIs());
         if (uris.Length() > Symbols::SpaceIsFromSpace().Length()) {
           if (!printed_where) {
             pieces.Add(Symbols::SpaceWhereNewLine());
           }
           pieces.Add(uris);
         }
       }
     }
   }
-  const String& error_msg =
-      String::Handle(zone, Symbols::FromConcatAll(pieces));
+  const Array& arr = Array::Handle(zone, Array::MakeArray(pieces));
+  const String& error_msg = String::Handle(zone, String::ConcatAll(arr));
   args.SetAt(3, error_msg);
 
   // Type errors in the core library may be difficult to diagnose.
   // Print type error information before throwing the error when debugging.
   if (FLAG_print_stacktrace_at_throw) {
     THR_Print("'%s': Failed type check: line %" Pd " pos %" Pd ": ",
               String::Handle(zone, script.url()).ToCString(), line, column);
     THR_Print("%s\n", error_msg.ToCString());
   }
 
@@ skipping 182 matching lines @@
   }
 
   return DartLibraryCalls::InstanceCreate(library,
                                           *class_name,
                                           *constructor_name,
                                           arguments);
 }
 
 
 }  // namespace dart