Make the "sticky error" an Error instead of a String.

runtime/vm/class_finalizer.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/class_finalizer.h"
 
 #include "vm/flags.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/longjump.h"
@@ skipping 36 matching lines @@
 
 
 // Class finalization occurs:
 // a) when bootstrap process completes (VerifyBootstrapClasses).
 // b) after the user classes are loaded (dart_api).
 bool ClassFinalizer::FinalizePendingClasses(bool generating_snapshot) {
   bool retval = true;
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   ObjectStore* object_store = isolate->object_store();
-  const String& error = String::Handle(object_store->sticky_error());
+  const Error& error = Error::Handle(object_store->sticky_error());
   if (!error.IsNull()) {
     return false;
   }
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
   if (setjmp(*jump.Set()) == 0) {
     const Array& class_array = Array::Handle(object_store->pending_classes());
     ASSERT(!class_array.IsNull());
     Class& cls = Class::Handle();
@@ skipping 168 matching lines @@
     cls ^= class_array.At(i);
     if (cls.is_finalized() || cls.is_prefinalized()) {
       // Pre-finalized bootstrap classes must not define any fields.
       ASSERT(Array::Handle(cls.fields()).Length() == 0);
     }
   }
 
   // Finalize classes that aren't pre-finalized by Object::Init().
   if (!FinalizePendingClasses()) {
     // TODO(srdjan): Exit like a real VM instead.
-    const String& err = String::Handle(object_store->sticky_error());
-    OS::PrintErr("Could not verify bootstrap classes : %s\n", err.ToCString());
+    const Error& err = Error::Handle(object_store->sticky_error());
+    OS::PrintErr("Could not verify bootstrap classes : %s\n",
+                 err.ToErrorCString());
     OS::Exit(255);
   }
   if (FLAG_trace_class_finalization) {
     OS::Print("VerifyBootstrapClasses END.\n");
   }
   Isolate::Current()->heap()->Verify();
 }
 
 
 // Resolve unresolved_class in the library of cls.
@@ skipping 432 matching lines @@
   } else {
     parameterized_type.set_is_finalized();
   }
   return parameterized_type.Canonicalize();
 }
 
 
 RawAbstractType* ClassFinalizer::FinalizeAndCanonicalizeType(
     const Class& cls,
     const AbstractType& type,
-    String* errmsg) {
+    Error* error) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
   if (setjmp(*jump.Set()) == 0) {
     const AbstractType& finalized_type =
         AbstractType::Handle(FinalizeType(cls, type));
     isolate->set_long_jump_base(base);
-    *errmsg = String::null();
+    *error = Error::null();
     return finalized_type.raw();
   } else {
     // Error occured: Get the error message.
     isolate->set_long_jump_base(base);
-    *errmsg = isolate->object_store()->sticky_error();
+    *error = isolate->object_store()->sticky_error();
     return type.raw();
   }
   UNREACHABLE();
   return NULL;
 }
 
 
 void ClassFinalizer::ResolveAndFinalizeSignature(const Class& cls,
                                                  const Function& function) {
   // Resolve result type.
@@ skipping 530 matching lines @@
   for (intptr_t i = 0; i < len; i++) {
     field ^= fields_array.At(i);
     OS::Print("  %s\n", field.ToCString());
   }
 }
 
 
 void ClassFinalizer::ReportError(const Script& script,
                                  intptr_t token_index,
                                  const char* format, ...) {
-  const intptr_t kMessageBufferSize = 512;
-  char message_buffer[kMessageBufferSize];
   va_list args;
   va_start(args, format);
-  Parser::FormatMessage(script, token_index, "Error",
-                        message_buffer, kMessageBufferSize,
-                        format, args);
-  Isolate::Current()->long_jump_base()->Jump(1, message_buffer);
+  const Error& error = Error::Handle(
+      Parser::FormatError(script, token_index, "Error", format, args));
+  Isolate::Current()->long_jump_base()->Jump(1, error);
   UNREACHABLE();
 }
 
 
 void ClassFinalizer::ReportError(const char* format, ...) {
-  const intptr_t kMessageBufferSize = 512;
-  char message_buffer[kMessageBufferSize];
   va_list args;
   va_start(args, format);
-  Parser::FormatMessage(Script::Handle(), -1, "Error",
-                        message_buffer, kMessageBufferSize,
-                        format, args);
+  const Error& error = Error::Handle(
+      Parser::FormatError(Script::Handle(), -1, "Error", format, args));
   va_end(args);
-  Isolate::Current()->long_jump_base()->Jump(1, message_buffer);
+  Isolate::Current()->long_jump_base()->Jump(1, error);
   UNREACHABLE();
 }
 
 
 void ClassFinalizer::ReportWarning(const Script& script,
                                   intptr_t token_index,
                                   const char* format, ...) {
   if (FLAG_silent_warnings) return;
-  const intptr_t kMessageBufferSize = 512;
-  char message_buffer[kMessageBufferSize];
   va_list args;
   va_start(args, format);
-  Parser::FormatMessage(script, token_index, "Warning",
-                        message_buffer, kMessageBufferSize,
-                        format, args);
+  const Error& error = Error::Handle(
+      Parser::FormatError(script, token_index, "Warning", format, args));
   va_end(args);
   if (FLAG_warning_as_error) {
-    Isolate::Current()->long_jump_base()->Jump(1, message_buffer);
+    Isolate::Current()->long_jump_base()->Jump(1, error);
     UNREACHABLE();
   } else {
-    OS::Print(message_buffer);
+    OS::Print("%s", error.ToErrorCString());
   }
 }
 
 }  // namespace dart