Change a couple of API functions to return unhandled exception errors instead of fatal errors on im…

runtime/vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 1971 matching lines @@
   }                                                                            \
   return Api::NewError("Invalid index passed in to set list element");         \
 
 
 DART_EXPORT Dart_Handle Dart_ListSetAt(Dart_Handle list,
                                        intptr_t index,
                                        Dart_Handle value) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(list));
-  if (obj.IsArray()) {
-    if (obj.IsImmutableArray()) {
-      return Api::NewError("Cannot modify immutable array");
-    }
+  if (obj.IsArray() && !obj.IsImmutableArray()) {

[Ivan Posva, 2013/01/25 00:53:48]

How about adding a comment that we let the Dart invocation below throw the
relevant exception? And what happens when the index is out of bounds?

[Mads Ager (google), 2013/01/29 10:15:13]

Done. If index is out of bounds we still get an unsupported operation error for
immutable arrays.

     SET_LIST_ELEMENT(isolate, Array, obj, index, value);
   } else if (obj.IsGrowableObjectArray()) {
     SET_LIST_ELEMENT(isolate, GrowableObjectArray, obj, index, value);
   } else if (obj.IsError()) {
     return list;
   } else {
     // Check and handle a dart object that implements the List interface.
     const Instance& instance =
         Instance::Handle(isolate, GetListInstance(isolate, obj));
     if (!instance.IsNull()) {
@@ skipping 140 matching lines @@
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(list));
   if (obj.IsUint8Array() || obj.IsExternalUint8Array() ||
       obj.IsUint8ClampedArray() || obj.IsExternalUint8ClampedArray()) {
     const ByteArray& byte_array = ByteArray::Cast(obj);
     if (Utils::RangeCheck(offset, length, byte_array.Length())) {
       ByteArray::Copy(byte_array, offset, native_array, length);
       return Api::Success(isolate);
     }
     return Api::NewError("Invalid length passed in to set list elements");
-  } else if (obj.IsArray()) {
-    if (obj.IsImmutableArray()) {
-      return Api::NewError("Cannot modify immutable array");
-    }
+  } else if (obj.IsArray() && !obj.IsImmutableArray()) {

[Ivan Posva, 2013/01/25 00:53:48]

ditto.

[Mads Ager (google), 2013/01/29 10:15:13]

Done.

     SET_LIST_ELEMENT_AS_BYTES(isolate,
                               Array,
                               obj,
                               native_array,
                               offset,
                               length);
   } else if (obj.IsGrowableObjectArray()) {
     SET_LIST_ELEMENT_AS_BYTES(isolate,
                               GrowableObjectArray,
                               obj,
                               native_array,
                               offset,
                               length);
   } else if (obj.IsError()) {
     return list;
   } else {
-  // Check and handle a dart object that implements the List interface.
+    // Check and handle a dart object that implements the List interface.
     const Instance& instance =
         Instance::Handle(isolate, GetListInstance(isolate, obj));
     if (!instance.IsNull()) {
       const Function& function = Function::Handle(
           isolate,
           Resolver::ResolveDynamic(instance,
                                    Symbols::AssignIndexToken(),
                                    3,
                                    0));
       if (!function.IsNull()) {
@@ skipping 2337 matching lines @@
   }
   {
     NoGCScope no_gc;
     RawObject* raw_obj = obj.raw();
     isolate->heap()->SetPeer(raw_obj, peer);
   }
   return Api::Success(isolate);
 }
 
 }  // namespace dart