- Refactor Symbol allocation to expect a thread parameter.

runtime/vm/report.cc

 // Copyright (c) 2014, 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/report.h"
 
 #include "vm/code_patcher.h"
 #include "vm/exceptions.h"
 #include "vm/flags.h"
 #include "vm/longjump.h"
@@ skipping 25 matching lines @@
     const String& script_url = String::Handle(script.url());
     if (token_pos.IsReal()) {
       intptr_t line, column, token_len;
       script.GetTokenLocation(token_pos, &line, &column, &token_len);
       if (report_after_token) {
         column += token_len;
       }
       // Only report the line position if we have the original source. We still
       // need to get a valid column so that we can report the ^ mark below the
       // snippet.
-      // Allocate formatted strings in old sapce as they may be created during
+      // Allocate formatted strings in old space as they may be created during
       // optimizing compilation. Those strings are created rarely and should not
       // polute old space.
       if (script.HasSource()) {
         result = String::NewFormatted(Heap::kOld,
                                       "'%s': %s: line %" Pd " pos %" Pd ": ",
                                       script_url.ToCString(),
                                       message_header,
                                       line,
                                       column);
       } else {
         result = String::NewFormatted(Heap::kOld,
                                       "'%s': %s: line %" Pd ": ",
                                       script_url.ToCString(),
                                       message_header,
                                       line);
       }
       // Append the formatted error or warning message.
-      GrowableHandlePtrArray<const String> strs(Thread::Current()->zone(), 5);
-      strs.Add(result);
-      strs.Add(message);
+      const Array& strs = Array::Handle(
+          Array::New(6, Heap::kOld));
+      strs.SetAt(0, result);
+      strs.SetAt(1, message);
       // Append the source line.
       const String& script_line = String::Handle(
           script.GetLine(line, Heap::kOld));
       ASSERT(!script_line.IsNull());
-      strs.Add(Symbols::NewLine());
-      strs.Add(script_line);
-      strs.Add(Symbols::NewLine());
+      strs.SetAt(2, Symbols::NewLine());
+      strs.SetAt(3, script_line);
+      strs.SetAt(4, Symbols::NewLine());
       // Append the column marker.
       const String& column_line = String::Handle(
           String::NewFormatted(Heap::kOld,
                                "%*s\n", static_cast<int>(column), "^"));
-      strs.Add(column_line);
-      // TODO(srdjan): Use Strings::FromConcatAll in old space, once
-      // implemented.
-      result = Symbols::FromConcatAll(strs);
+      strs.SetAt(5, column_line);
+      result = String::ConcatAll(strs, Heap::kOld);
     } else {
       // Token position is unknown.
       result = String::NewFormatted(Heap::kOld, "'%s': %s: ",
                                     script_url.ToCString(),
                                     message_header);
       result = String::Concat(result, message, Heap::kOld);
     }
   } else {
     // Script is unknown.
     // Append the formatted error or warning message.
@@ skipping 68 matching lines @@
       LanguageError::NewFormattedV(Error::Handle(),  // No previous error.
                                    script, token_pos, report_after_token,
                                    kind, Heap::kOld,
                                    format, args));
   LongJump(error);
   UNREACHABLE();
 }
 
 }  // namespace dart