Cleanup VM error handling.

runtime/bin/dartutils.cc

 // Copyright (c) 2012, 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 "bin/dartutils.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
@@ skipping 760 matching lines @@
 Dart_Handle DartUtils::NewDartOSError() {
   // Extract the current OS error.
   OSError os_error;
   return NewDartOSError(&os_error);
 }
 
 
 Dart_Handle DartUtils::NewDartOSError(OSError* os_error) {
   // Create a dart:io OSError object with the information retrieved from the OS.
   Dart_Handle type = GetDartType(kIOLibURL, "OSError");
+  ASSERT(!Dart_IsError(type));
   Dart_Handle args[2];
   args[0] = NewString(os_error->message());
   args[1] = Dart_NewInteger(os_error->code());
   return Dart_New(type, Dart_Null(), 2, args);
 }
 
 
 Dart_Handle DartUtils::NewDartExceptionWithOSError(const char* library_url,
                                                    const char* exception_name,
                                                    const char* message,
                                                    Dart_Handle os_error) {
   // Create a Dart Exception object with a message and an OSError.
   Dart_Handle type = GetDartType(library_url, exception_name);
+  ASSERT(!Dart_IsError(type));
   Dart_Handle args[2];
   args[0] = NewString(message);
   args[1] = os_error;
   return Dart_New(type, Dart_Null(), 2, args);
 }
 
 
 Dart_Handle DartUtils::NewDartExceptionWithMessage(const char* library_url,
                                                    const char* exception_name,
                                                    const char* message) {
   // Create a Dart Exception object with a message.
   Dart_Handle type = GetDartType(library_url, exception_name);
+  ASSERT(!Dart_IsError(type));
   if (message != NULL) {
     Dart_Handle args[1];
     args[0] = NewString(message);
     return Dart_New(type, Dart_Null(), 1, args);
   } else {
     return Dart_New(type, Dart_Null(), 0, NULL);
   }
 }
 
 
 Dart_Handle DartUtils::NewDartArgumentError(const char* message) {
   return NewDartExceptionWithMessage(kCoreLibURL,
                                      "ArgumentError",
                                      message);
 }
 
 
 Dart_Handle DartUtils::NewDartIOException(const char* exception_name,
                                           const char* message,
                                           Dart_Handle os_error) {
   // Create a dart:io exception object of the given type.
   return NewDartExceptionWithOSError(kIOLibURL,
                                      exception_name,
                                      message,
                                      os_error);
 }
 
 
 Dart_Handle DartUtils::NewInternalError(const char* message) {
-  return NewDartExceptionWithMessage(kCoreLibURL, "InternalError", message);
+  return NewDartExceptionWithMessage(kCoreLibURL, "_InternalError", message);
 }
 
 
 void DartUtils::SetOriginalWorkingDirectory() {
   original_working_directory = Directory::Current();
 }
 
 
 // Statically allocated Dart_CObject instances for immutable
 // objects. As these will be used by different threads the use of
@@ skipping 149 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart