Start using Dart_PropagateError in the runtime/bin directory.

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 "bin/file.h"
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/globals.h"
@@ skipping 29 matching lines @@
     }
   }
   return NULL;  // Did not find a mapping for this URL.
 }
 
 
 int64_t DartUtils::GetIntegerValue(Dart_Handle value_obj) {
   ASSERT(Dart_IsInteger(value_obj));
   int64_t value = 0;
   Dart_Handle result = Dart_IntegerToInt64(value_obj, &value);
-  ASSERT(!Dart_IsError(result));
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
   return value;
 }
 
 
 const char* DartUtils::GetStringValue(Dart_Handle str_obj) {
   const char* cstring = NULL;
   Dart_Handle result = Dart_StringToCString(str_obj, &cstring);
-  ASSERT(!Dart_IsError(result));
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
   return cstring;
 }
 
 
 bool DartUtils::GetBooleanValue(Dart_Handle bool_obj) {
   bool value = false;
   Dart_Handle result = Dart_BooleanValue(bool_obj, &value);
-  ASSERT(!Dart_IsError(result));
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
   return value;
 }
 
 
 void DartUtils::SetIntegerField(Dart_Handle handle,
                                 const char* name,
                                 intptr_t val) {
   Dart_Handle result = Dart_SetField(handle,
                                      Dart_NewString(name),
                                      Dart_NewInteger(val));
-  ASSERT(!Dart_IsError(result));
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
 }
 
 
 intptr_t DartUtils::GetIntegerField(Dart_Handle handle,
                                             const char* name) {
   Dart_Handle result = Dart_GetField(handle, Dart_NewString(name));
-  ASSERT(!Dart_IsError(result));
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
   intptr_t value = DartUtils::GetIntegerValue(result);
   return value;
 }
 
 
 void DartUtils::SetStringField(Dart_Handle handle,
                                const char* name,
                                const char* val) {
   Dart_Handle result = Dart_SetField(handle,
                                      Dart_NewString(name),
                                      Dart_NewString(val));
-  ASSERT(!Dart_IsError(result));
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
 }
 
 
 bool DartUtils::IsDartSchemeURL(const char* url_name) {
   static const intptr_t kDartSchemeLen = strlen(kDartScheme);
   // If the URL starts with "dart:" then it is considered as a special
   // library URL which is handled differently from other URLs.
   return (strncmp(url_name, kDartScheme, kDartSchemeLen) == 0);
 }
 
@@ skipping 26 matching lines @@
   return (strcmp(url_name, kUtfLibURL) == 0);
 }
 
 
 Dart_Handle DartUtils::CanonicalizeURL(CommandLineOptions* url_mapping,
                                        Dart_Handle library,
                                        const char* url_str) {
   // Get the url of the including library.
   Dart_Handle library_url = Dart_LibraryUrl(library);
   if (Dart_IsError(library_url)) {
-    return Dart_Error("accessing library url failed");
+    return library_url;
   }
   if (!Dart_IsString8(library_url)) {
     return Dart_Error("library url is not a string");
   }
   const char* library_url_str = NULL;
   Dart_Handle result = Dart_StringToCString(library_url, &library_url_str);
   if (Dart_IsError(result)) {
-    return Dart_Error("accessing library url characters failed");
+    return result;
   }
   if (url_mapping != NULL) {
     const char* mapped_library_url_str = MapLibraryUrl(url_mapping,
                                                        library_url_str);
     if (mapped_library_url_str != NULL) {
       library_url_str = mapped_library_url_str;
     }
   }
   // Calculate the canonical path.
   const char* canon_url_str = GetCanonicalPath(library_url_str, url_str);
@@ skipping 209 matching lines @@
   return cobject;
 }
 
 
 Dart_CObject* CObject::NewByteArray(int length) {
   Dart_CObject* cobject = New(Dart_CObject::kByteArray, length);
   cobject->value.as_byte_array.length = length;
   cobject->value.as_byte_array.values = reinterpret_cast<uint8_t*>(cobject + 1);
   return cobject;
 }