Fix native argument handling

runtime/lib/error.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 "lib/error.h"
 
 #include "vm/bootstrap_natives.h"
 #include "vm/exceptions.h"
 #include "vm/object_store.h"
 #include "vm/runtime_entry.h"
 #include "vm/stack_frame.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, trace_type_checks, false, "Trace runtime type checks.");
 
 // Allocate and throw a new AssertionError.
 // Arg0: index of the first token of the failed assertion.
 // Arg1: index of the first token after the failed assertion.
 // Return value: none, throws an exception.
 DEFINE_NATIVE_ENTRY(AssertionError_throwNew, 2) {
   // No need to type check the arguments. This function can only be called
   // internally from the VM.
-  intptr_t assertion_start = Smi::CheckedHandle(arguments->At(0)).Value();
-  intptr_t assertion_end = Smi::CheckedHandle(arguments->At(1)).Value();
+  intptr_t assertion_start =
+      Smi::CheckedHandle(arguments->NativeArgAt(0)).Value();
+  intptr_t assertion_end =
+      Smi::CheckedHandle(arguments->NativeArgAt(1)).Value();
 
   // Allocate a new instance of type AssertionError.
   const Instance& assertion_error = Instance::Handle(
       Exceptions::NewInstance("AssertionErrorImplementation"));
 
   // Initialize 'url', 'line', and 'column' fields.
   DartFrameIterator iterator;
   iterator.NextFrame();  // Skip native call.
   const Script& script = Script::Handle(Exceptions::GetCallerScript(&iterator));
   const Class& cls = Class::Handle(assertion_error.clazz());
@@ skipping 17 matching lines @@
 // Allocate and throw a new TypeError.
 // Arg0: index of the token of the failed type check.
 // Arg1: src value.
 // Arg2: dst type name.
 // Arg3: dst name.
 // Arg4: type error message.
 // Return value: none, throws an exception.
 DEFINE_NATIVE_ENTRY(TypeError_throwNew, 5) {
   // No need to type check the arguments. This function can only be called
   // internally from the VM.
-  intptr_t location = Smi::CheckedHandle(arguments->At(0)).Value();
-  const Instance& src_value = Instance::CheckedHandle(arguments->At(1));
-  const String& dst_type_name = String::CheckedHandle(arguments->At(2));
-  const String& dst_name = String::CheckedHandle(arguments->At(3));
-  const String& type_error = String::CheckedHandle(arguments->At(4));
+  intptr_t location = Smi::CheckedHandle(arguments->NativeArgAt(0)).Value();
+  const Instance& src_value =
+      Instance::CheckedHandle(arguments->NativeArgAt(1));
+  const String& dst_type_name =
+      String::CheckedHandle(arguments->NativeArgAt(2));
+  const String& dst_name = String::CheckedHandle(arguments->NativeArgAt(3));
+  const String& type_error = String::CheckedHandle(arguments->NativeArgAt(4));
   const String& src_type_name =
       String::Handle(Type::Handle(src_value.GetType()).UserVisibleName());
   Exceptions::CreateAndThrowTypeError(location, src_type_name,
                                       dst_type_name, dst_name, type_error);
   UNREACHABLE();
   return Object::null();
 }
 
 
 // Allocate and throw a new FallThroughError.
 // Arg0: index of the case clause token into which we fall through.
 // Return value: none, throws an exception.
 DEFINE_NATIVE_ENTRY(FallThroughError_throwNew, 1) {
-  GET_NATIVE_ARGUMENT(Smi, smi_pos, arguments->At(0));
+  GET_NATIVE_ARGUMENT(Smi, smi_pos, arguments->NativeArgAt(0));
   intptr_t fallthrough_pos = smi_pos.Value();
 
   // Allocate a new instance of type FallThroughError.
   const Instance& fallthrough_error = Instance::Handle(Exceptions::NewInstance(
       "FallThroughErrorImplementation"));
   ASSERT(!fallthrough_error.IsNull());
 
   // Initialize 'url' and 'line' fields.
   DartFrameIterator iterator;
   iterator.NextFrame();  // Skip native call.
@@ skipping 11 matching lines @@
   UNREACHABLE();
   return Object::null();
 }
 
 
 // Allocate and throw a new AbstractClassInstantiationError.
 // Arg0: Token position of allocation statement.
 // Arg1: class name of the abstract class that cannot be instantiated.
 // Return value: none, throws an exception.
 DEFINE_NATIVE_ENTRY(AbstractClassInstantiationError_throwNew, 2) {
-  GET_NATIVE_ARGUMENT(Smi, smi_pos, arguments->At(0));
-  GET_NATIVE_ARGUMENT(String, class_name, arguments->At(1));
+  GET_NATIVE_ARGUMENT(Smi, smi_pos, arguments->NativeArgAt(0));
+  GET_NATIVE_ARGUMENT(String, class_name, arguments->NativeArgAt(1));
   intptr_t error_pos = smi_pos.Value();
 
   // Allocate a new instance of type AbstractClassInstantiationError.
   const Instance& error = Instance::Handle(Exceptions::NewInstance(
       "AbstractClassInstantiationErrorImplementation"));
   ASSERT(!error.IsNull());
 
   // Initialize 'url', 'line' and 'className' fields.
   DartFrameIterator iterator;
   iterator.NextFrame();  // Skip native call.
@@ skipping 10 matching lines @@
   UNREACHABLE();
   return Object::null();
 }
 
 
 // Allocate and throw NoSuchMethodError.
 // Arg0: index of the call that was not resolved at compile time.
 // Arg1: name of the method that was not resolved at compile time.
 // Return value: none, throws an exception.
 DEFINE_NATIVE_ENTRY(NoSuchMethodError_throwNew, 2) {
-  GET_NATIVE_ARGUMENT(Smi, smi_pos, arguments->At(0));
-  GET_NATIVE_ARGUMENT(String, function_name, arguments->At(1));
+  GET_NATIVE_ARGUMENT(Smi, smi_pos, arguments->NativeArgAt(0));
+  GET_NATIVE_ARGUMENT(String, function_name, arguments->NativeArgAt(1));
   intptr_t call_pos = smi_pos.Value();
   // Allocate a new instance of type NoSuchMethodError.
   const Instance& error = Instance::Handle(
       Exceptions::NewInstance("NoSuchMethodErrorImplementation"));
   ASSERT(!error.IsNull());
 
   // Initialize 'url', 'line', and 'column' fields.
   DartFrameIterator iterator;
   iterator.NextFrame();  // Skip native call.
   const Script& script = Script::Handle(Exceptions::GetCallerScript(&iterator));
   const Class& cls = Class::Handle(error.clazz());
   Exceptions::SetLocationFields(error, cls, script, call_pos);
   Exceptions::SetField(error, cls, "functionName", function_name);
 
   intptr_t line, column;
   script.GetTokenLocation(call_pos, &line, &column);
   Exceptions::SetField(error, cls, "failedResolutionLine",
                        String::Handle(script.GetLine(line)));
 
   Exceptions::Throw(error);
   UNREACHABLE();
   return Object::null();
 }
 
 }  // namespace dart