Use the return value of vm native methods to set the return value,

lib/byte_array.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 "vm/bootstrap_natives.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/exceptions.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
@@ skipping 40 matching lines @@
 #define SETTER_ARGUMENTS(ArrayT, ObjectT, ValueT)                       \
   GET_NATIVE_ARGUMENT(ArrayT, array, arguments->At(0));                 \
   GET_NATIVE_ARGUMENT(Smi, index, arguments->At(1));                    \
   GET_NATIVE_ARGUMENT(ObjectT, value_object, arguments->At(2));
 
 
 #define GETTER(ArrayT, ObjectT, ValueT)                                 \
   GETTER_ARGUMENTS(ArrayT, ValueT);                                     \
   RangeCheck(array, index.Value() * sizeof(ValueT), sizeof(ValueT));    \
   ValueT result = array.At(index.Value());                              \
-  arguments->SetReturn(ObjectT::Handle(ObjectT::New(result)));
+  return ObjectT::New(result);
 
 
 #define SETTER(ArrayT, ObjectT, Getter, ValueT)                         \
   SETTER_ARGUMENTS(ArrayT, ObjectT, ValueT);                            \
   RangeCheck(array, index.Value() * sizeof(ValueT), sizeof(ValueT));    \
   ValueT value = value_object.Getter();                                 \
-  array.SetAt(index.Value(), value);
+  array.SetAt(index.Value(), value);                                    \
+  return Object::null();
 
 
 #define UNALIGNED_GETTER(ArrayT, ObjectT, ValueT)                       \
   GETTER_ARGUMENTS(ArrayT, ValueT);                                     \
   RangeCheck(array, index.Value(), sizeof(ValueT));                     \
   ValueT result;                                                        \
   ByteArray::Copy(&result, array, index.Value(), sizeof(ValueT));       \
-  arguments->SetReturn(ObjectT::Handle(ObjectT::New(result)));
+  return ObjectT::New(result);
 
 
 #define UNALIGNED_SETTER(ArrayT, ObjectT, Getter, ValueT)               \
   SETTER_ARGUMENTS(ArrayT, ObjectT, ValueT);                            \
   RangeCheck(array, index.Value(), sizeof(ValueT));                     \
   ValueT src = value_object.Getter();                                   \
   ByteArray::Copy(array, index.Value(), &src, sizeof(ValueT));          \
-  Integer& result = Integer::Handle();                                  \
-  result ^= Integer::New(index.Value() + sizeof(ValueT));               \
-  arguments->SetReturn(result);
+  return Integer::New(index.Value() + sizeof(ValueT));
 
 
 #define UINT64_TO_INTEGER(value, integer)                               \
   if (value > static_cast<uint64_t>(Mint::kMaxValue)) {                 \
     result = BigintOperations::NewFromUint64(value);                    \
   } else if (value > static_cast<uint64_t>(Smi::kMaxValue)) {           \
     result = Mint::New(value);                                          \
   } else {                                                              \
     result = Smi::New(value);                                           \
   }
 
 
 #define GETTER_UINT64(ArrayT)                                           \
   GETTER_ARGUMENTS(ArrayT, uint64_t);                                   \
   intptr_t size = sizeof(uint64_t);                                     \
   RangeCheck(array, index.Value() * size, size);                        \
   uint64_t value = array.At(index.Value());                             \
   Integer& result = Integer::Handle();                                  \
   UINT64_TO_INTEGER(value, result);                                     \
-  arguments->SetReturn(result);
+  return result.raw();
 
 
 #define UNALIGNED_GETTER_UINT64(ArrayT)                                 \
   GETTER_ARGUMENTS(ArrayT, uint64_t);                                   \
   RangeCheck(array, index.Value(), sizeof(uint64_t));                   \
   uint64_t value;                                                       \
   ByteArray::Copy(&value, array, index.Value(), sizeof(uint64_t));      \
   Integer& result = Integer::Handle();                                  \
   UINT64_TO_INTEGER(value, result);                                     \
-  arguments->SetReturn(result);
+  return result.raw();
 
 
 #define INTEGER_TO_UINT64(integer, uint64)                              \
   if (integer.IsBigint()) {                                             \
     Bigint& bigint = Bigint::Handle();                                  \
     bigint ^= integer.raw();                                            \
     ASSERT(BigintOperations::FitsIntoUint64(bigint));                   \
     value = BigintOperations::AbsToUint64(bigint);                      \
   } else {                                                              \
     ASSERT(integer.IsMint() || integer.IsSmi());                        \
     value = integer.AsInt64Value();                                     \
   }                                                                     \
 
 
 #define SETTER_UINT64(ArrayT)                                           \
   SETTER_ARGUMENTS(ArrayT, Integer, uint64_t);                          \
   intptr_t size = sizeof(uint64_t);                                     \
   RangeCheck(array, index.Value() * size, size);                        \
   uint64_t value;                                                       \
   INTEGER_TO_UINT64(value_object, value);                               \
-  array.SetAt(index.Value(), value);
+  array.SetAt(index.Value(), value);                                    \
+  return Object::null();
 
 
 #define UNALIGNED_SETTER_UINT64(ArrayT)                                 \
   SETTER_ARGUMENTS(ArrayT, Integer, uint64_t);                          \
   RangeCheck(array, index.Value(), sizeof(uint64_t));                   \
   uint64_t value;                                                       \
   INTEGER_TO_UINT64(value_object, value);                               \
   ByteArray::Copy(array, index.Value(), &value, sizeof(uint64_t));      \
-  Integer& result = Integer::Handle();                                  \
-  result ^= Integer::New(index.Value() + sizeof(uint64_t));             \
-  arguments->SetReturn(result);
+  return Integer::New(index.Value() + sizeof(uint64_t));
 
 
 DEFINE_NATIVE_ENTRY(ByteArray_getLength, 1) {
   GET_NATIVE_ARGUMENT(ByteArray, array, arguments->At(0));
-  const Smi& length = Smi::Handle(Smi::New(array.Length()));
-  arguments->SetReturn(length);
+  return Smi::New(array.Length());
 }
 
 
 DEFINE_NATIVE_ENTRY(ByteArray_getInt8, 2) {
   UNALIGNED_GETTER(ByteArray, Smi, int8_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(ByteArray_setInt8, 3) {
   UNALIGNED_SETTER(ByteArray, Smi, Value, int8_t);
@@ skipping 102 matching lines @@
   if (length_value < 0) {
     const String& error = String::Handle(String::NewFormatted(
         "length (%ld) must be non-negative", length_value));
     GrowableArray<const Object*> args;
     args.Add(&error);
     Exceptions::ThrowByType(Exceptions::kIllegalArgument, args);
   }
   RangeCheck(src, src_start_value, length_value);
   RangeCheck(dst, dst_start_value, length_value);
   ByteArray::Copy(dst, dst_start_value, src, src_start_value, length_value);
+  return Object::null();
 }
 
 
 // Int8Array
 
 DEFINE_NATIVE_ENTRY(Int8Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
   intptr_t len = length.Value();
   LengthCheck(len, Int8Array::kMaxElements);
-  const Int8Array& new_array = Int8Array::Handle(Int8Array::New(len));
-  arguments->SetReturn(new_array);
+  return Int8Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int8Array_getIndexed, 2) {
   GETTER(Int8Array, Smi, int8_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int8Array_setIndexed, 3) {
   SETTER(Int8Array, Smi, Value, int8_t);
 }
 
 
 // Uint8Array
 
 DEFINE_NATIVE_ENTRY(Uint8Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint8Array::kMaxElements);
-  const Uint8Array& new_array = Uint8Array::Handle(Uint8Array::New(len));
-  arguments->SetReturn(new_array);
+  return Uint8Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint8Array_getIndexed, 2) {
   GETTER(Uint8Array, Smi, uint8_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint8Array_setIndexed, 3) {
   SETTER(Uint8Array, Smi, Value, uint8_t);
 }
 
 
 // Int16Array
 
 DEFINE_NATIVE_ENTRY(Int16Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
   intptr_t len = length.Value();
   LengthCheck(len, Int16Array::kMaxElements);
-  const Int16Array& new_array = Int16Array::Handle(Int16Array::New(len));
-  arguments->SetReturn(new_array);
+  return Int16Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int16Array_getIndexed, 2) {
   GETTER(Int16Array, Smi, int16_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int16Array_setIndexed, 3) {
   SETTER(Int16Array, Smi, Value, int16_t);
 }
 
 
 // Uint16Array
 
 DEFINE_NATIVE_ENTRY(Uint16Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint16Array::kMaxElements);
-  const Uint16Array& new_array = Uint16Array::Handle(Uint16Array::New(len));
-  arguments->SetReturn(new_array);
+  return Uint16Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint16Array_getIndexed, 2) {
   GETTER(Uint16Array, Smi, uint16_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint16Array_setIndexed, 3) {
   SETTER(Uint16Array, Smi, Value, uint16_t);
 }
 
 
 // Int32Array
 
 DEFINE_NATIVE_ENTRY(Int32Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
   intptr_t len = length.Value();
   LengthCheck(len, Int32Array::kMaxElements);
-  const Int32Array& new_array = Int32Array::Handle(Int32Array::New(len));
-  arguments->SetReturn(new_array);
+  return Int32Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int32Array_getIndexed, 2) {
   GETTER(Int32Array, Integer, int32_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int32Array_setIndexed, 3) {
   SETTER(Int32Array, Integer, AsInt64Value, int32_t);
 }
 
 
 // Uint32Array
 
 DEFINE_NATIVE_ENTRY(Uint32Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint32Array::kMaxElements);
-  const Uint32Array& new_array = Uint32Array::Handle(Uint32Array::New(len));
-  arguments->SetReturn(new_array);
+  return Uint32Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint32Array_getIndexed, 2) {
   GETTER(Uint32Array, Integer, uint32_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint32Array_setIndexed, 3) {
   SETTER(Uint32Array, Integer, AsInt64Value, uint32_t);
 }
 
 
 // Int64Array
 
 DEFINE_NATIVE_ENTRY(Int64Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
   intptr_t len = length.Value();
   LengthCheck(len, Int64Array::kMaxElements);
-  const Int64Array& new_array = Int64Array::Handle(Int64Array::New(len));
-  arguments->SetReturn(new_array);
+  return Int64Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int64Array_getIndexed, 2) {
   GETTER(Int64Array, Integer, int64_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int64Array_setIndexed, 3) {
   SETTER(Int64Array, Integer, AsInt64Value, int64_t);
 }
 
 
 // Uint64Array
 
 DEFINE_NATIVE_ENTRY(Uint64Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint64Array::kMaxElements);
-  const Uint64Array& new_array = Uint64Array::Handle(Uint64Array::New(len));
-  arguments->SetReturn(new_array);
+  return Uint64Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint64Array_getIndexed, 2) {
   GETTER_UINT64(Uint64Array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint64Array_setIndexed, 3) {
   SETTER_UINT64(Uint64Array);
 }
 
 
 // Float32Array
 
 DEFINE_NATIVE_ENTRY(Float32Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
   intptr_t len = length.Value();
   LengthCheck(len, Float32Array::kMaxElements);
-  const Float32Array& new_array = Float32Array::Handle(Float32Array::New(len));
-  arguments->SetReturn(new_array);
+  return Float32Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Float32Array_getIndexed, 2) {
   GETTER(Float32Array, Double, float);
 }
 
 
 DEFINE_NATIVE_ENTRY(Float32Array_setIndexed, 3) {
   SETTER(Float32Array, Double, value, float);
 }
 
 
 // Float64Array
 
 DEFINE_NATIVE_ENTRY(Float64Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
   intptr_t len = length.Value();
   LengthCheck(len, Float64Array::kMaxElements);
-  const Float64Array& new_array = Float64Array::Handle(Float64Array::New(len));
-  arguments->SetReturn(new_array);
+  return Float64Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Float64Array_getIndexed, 2) {
   GETTER(Float64Array, Double, double);
 }
 
 
 DEFINE_NATIVE_ENTRY(Float64Array_setIndexed, 3) {
   SETTER(Float64Array, Double, value, double);
@@ skipping 113 matching lines @@
 DEFINE_NATIVE_ENTRY(ExternalFloat64Array_getIndexed, 2) {
   GETTER(ExternalFloat64Array, Double, double);
 }
 
 
 DEFINE_NATIVE_ENTRY(ExternalFloat64Array_setIndexed, 3) {
   SETTER(ExternalFloat64Array, Double, value, double);
 }
 
 }  // namespace dart