Add synchronous mirror API. Resurrects invoke, apply, newInstance, getField and setField as synchro…

runtime/lib/mirrors.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 "include/dart_debugger_api.h"
 #include "platform/json.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/dart_entry.h"
 #include "vm/exceptions.h"
@@ skipping 180 matching lines @@
     Dart_Handle arg = Dart_ListGetAt(arg_list, i);
     Dart_Handle unwrapped_arg = UnwrapArg(arg);
     if (Dart_IsError(unwrapped_arg)) {
       return unwrapped_arg;
     }
     arg_array->Add(unwrapped_arg);
   }
   return Dart_True();
 }
 
+static Dart_Handle UnpackLocalArgList(Dart_Handle arg_list,
+                                      GrowableArray<Dart_Handle>* arg_array) {
+  intptr_t len = 0;
+  Dart_Handle result = Dart_ListLength(arg_list, &len);
+  if (Dart_IsError(result)) {
+    return result;
+  }
+  for (intptr_t i = 0; i < len; i++) {
+    Dart_Handle arg = Dart_ListGetAt(arg_list, i);
+    if (Dart_IsError(arg)) {
+      return arg;
+    }
+    arg_array->Add(arg);
+  }
+  return Dart_True();
+}
 
 static Dart_Handle CreateLazyMirror(Dart_Handle target);
 
 
 static Dart_Handle CreateParameterMirrorList(Dart_Handle func) {
   int64_t fixed_param_count;
   int64_t opt_param_count;
   Dart_Handle result = Dart_FunctionParameterCounts(func,
                                                     &fixed_param_count,
                                                     &opt_param_count);
@@ skipping 833 matching lines @@
   Dart_Handle reflectee = Dart_GetNativeArgument(args, 0);
   Dart_Handle mirror = CreateInstanceMirror(reflectee);
   if (Dart_IsError(mirror)) {
     Dart_PropagateError(mirror);
   }
   Dart_SetReturnValue(args, mirror);
   Dart_ExitScope();
 }
 
 
-void NATIVE_ENTRY_FUNCTION(LocalObjectMirrorImpl_invoke)(
+void NATIVE_ENTRY_FUNCTION(LocalObjectMirrorImpl_invokeAsync)(
     Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle mirror = Dart_GetNativeArgument(args, 0);
   Dart_Handle member = Dart_GetNativeArgument(args, 1);
   // The wrapped arguments are either simple values or instance mirrors.
   Dart_Handle wrapped_invoke_args = Dart_GetNativeArgument(args, 2);
 
   Dart_Handle reflectee = UnwrapMirror(mirror);
   GrowableArray<Dart_Handle> invoke_args;
   Dart_Handle result = UnwrapArgList(wrapped_invoke_args, &invoke_args);
@@ skipping 33 matching lines @@
 
   Dart_Handle wrapped_result = CreateInstanceMirror(result);
   if (Dart_IsError(wrapped_result)) {
     Dart_PropagateError(wrapped_result);
   }
   Dart_SetReturnValue(args, wrapped_result);
   Dart_ExitScope();
 }
 
 
-void NATIVE_ENTRY_FUNCTION(LocalObjectMirrorImpl_setField)(
+void NATIVE_ENTRY_FUNCTION(LocalObjectMirrorImpl_setFieldAsync)(
     Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle mirror = Dart_GetNativeArgument(args, 0);
   Dart_Handle fieldName = Dart_GetNativeArgument(args, 1);
   // The wrapped argument is either a simple value or instance mirror.
   Dart_Handle wrapped_arg = Dart_GetNativeArgument(args, 2);
 
   Dart_Handle reflectee = UnwrapMirror(mirror);
   Dart_Handle set_arg = UnwrapArg(wrapped_arg);
   if (Dart_IsError(set_arg)) {
     Dart_PropagateError(set_arg);
   }
   Dart_Handle result = Dart_SetField(reflectee, fieldName, set_arg);
   if (Dart_IsError(result)) {
     // Instead of propagating the error from a SetField directly, we
     // provide reflective access to the error.
     Dart_PropagateError(CreateMirroredError(result));
   }
 
   Dart_Handle wrapped_result = CreateInstanceMirror(result);
   if (Dart_IsError(wrapped_result)) {
     Dart_PropagateError(wrapped_result);
   }
   Dart_SetReturnValue(args, wrapped_result);
   Dart_ExitScope();
 }
 
 
-void NATIVE_ENTRY_FUNCTION(LocalClosureMirrorImpl_apply)(
+void NATIVE_ENTRY_FUNCTION(LocalClosureMirrorImpl_applyAsync)(
     Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle mirror = Dart_GetNativeArgument(args, 0);
   // The wrapped arguments are either simple values or instance mirrors.
   Dart_Handle wrapped_invoke_args = Dart_GetNativeArgument(args, 1);
 
   Dart_Handle reflectee = UnwrapMirror(mirror);
   GrowableArray<Dart_Handle> invoke_args;
   Dart_Handle result = UnwrapArgList(wrapped_invoke_args, &invoke_args);
   if (Dart_IsError(result)) {
     Dart_PropagateError(result);
   }
   result =
       Dart_InvokeClosure(reflectee, invoke_args.length(), invoke_args.data());
   if (Dart_IsError(result)) {
     // Instead of propagating the error from an apply directly, we
     // provide reflective access to the error.
     Dart_PropagateError(CreateMirroredError(result));
   }
 
   Dart_Handle wrapped_result = CreateInstanceMirror(result);
   if (Dart_IsError(wrapped_result)) {
     Dart_PropagateError(wrapped_result);
   }
   Dart_SetReturnValue(args, wrapped_result);
   Dart_ExitScope();
 }
 
 
-void NATIVE_ENTRY_FUNCTION(LocalClassMirrorImpl_invokeConstructor)(
+void NATIVE_ENTRY_FUNCTION(LocalClassMirrorImpl_invokeConstructorAsync)(
     Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle klass_mirror = Dart_GetNativeArgument(args, 0);
   Dart_Handle constructor_name = Dart_GetNativeArgument(args, 1);
   // The wrapped arguments are either simple values or instance mirrors.
   Dart_Handle wrapped_invoke_args = Dart_GetNativeArgument(args, 2);
 
   Dart_Handle klass = UnwrapMirror(klass_mirror);
   GrowableArray<Dart_Handle> invoke_args;
   Dart_Handle result = UnwrapArgList(wrapped_invoke_args, &invoke_args);
@@ skipping 10 matching lines @@
     Dart_PropagateError(CreateMirroredError(result));
   }
 
   Dart_Handle wrapped_result = CreateInstanceMirror(result);
   if (Dart_IsError(wrapped_result)) {
     Dart_PropagateError(wrapped_result);
   }
   Dart_SetReturnValue(args, wrapped_result);
   Dart_ExitScope();
 }
 

[Ivan Posva, 2013/04/12 21:15:26]

Two lines.

+void NATIVE_ENTRY_FUNCTION(LocalObjectMirrorImpl_invoke)(
+    Dart_NativeArguments args) {
+  Dart_EnterScope();
+  Dart_Handle mirror = Dart_GetNativeArgument(args, 0);
+  Dart_Handle member = Dart_GetNativeArgument(args, 1);
+

[Ivan Posva, 2013/04/12 21:15:26]

Want to add a comment here that the wrapped arguments are not mirrors unlike in
the async case?

+  Dart_Handle wrapped_invoke_args = Dart_GetNativeArgument(args, 2);
+
+  Dart_Handle reflectee = UnwrapMirror(mirror);
+  GrowableArray<Dart_Handle> invoke_args;
+  Dart_Handle result = UnpackLocalArgList(wrapped_invoke_args, &invoke_args);
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
+  result =
+      Dart_Invoke(reflectee, member, invoke_args.length(), invoke_args.data());
+  if (Dart_IsError(result)) {
+    // Instead of propagating the error from an invoke directly, we
+    // provide reflective access to the error.
+    Dart_PropagateError(CreateMirroredError(result));
+  }
+
+  Dart_Handle wrapped_result = CreateInstanceMirror(result);
+  if (Dart_IsError(wrapped_result)) {
+    Dart_PropagateError(wrapped_result);
+  }
+  Dart_SetReturnValue(args, wrapped_result);
+  Dart_ExitScope();
+}
+

[Ivan Posva, 2013/04/12 21:15:26]

ditto

+void NATIVE_ENTRY_FUNCTION(LocalObjectMirrorImpl_setField)(

[Ivan Posva, 2013/04/12 21:15:26]

What is the difference between this and the Async native function?

+    Dart_NativeArguments args) {
+  Dart_EnterScope();
+  Dart_Handle mirror = Dart_GetNativeArgument(args, 0);
+  Dart_Handle fieldName = Dart_GetNativeArgument(args, 1);
+
+  Dart_Handle set_arg = Dart_GetNativeArgument(args, 2);
+
+  Dart_Handle reflectee = UnwrapMirror(mirror);
+  if (Dart_IsError(set_arg)) {
+    Dart_PropagateError(set_arg);
+  }
+  Dart_Handle result = Dart_SetField(reflectee, fieldName, set_arg);
+  if (Dart_IsError(result)) {
+    // Instead of propagating the error from a SetField directly, we
+    // provide reflective access to the error.
+    Dart_PropagateError(CreateMirroredError(result));
+  }
+
+  Dart_Handle wrapped_result = CreateInstanceMirror(result);
+  if (Dart_IsError(wrapped_result)) {
+    Dart_PropagateError(wrapped_result);
+  }
+  Dart_SetReturnValue(args, wrapped_result);
+  Dart_ExitScope();
+}
+
+
+void NATIVE_ENTRY_FUNCTION(LocalClosureMirrorImpl_apply)(
+    Dart_NativeArguments args) {
+  Dart_EnterScope();
+  Dart_Handle mirror = Dart_GetNativeArgument(args, 0);
+
+  Dart_Handle wrapped_invoke_args = Dart_GetNativeArgument(args, 1);
+
+  Dart_Handle reflectee = UnwrapMirror(mirror);
+  GrowableArray<Dart_Handle> invoke_args;
+  Dart_Handle result = UnpackLocalArgList(wrapped_invoke_args, &invoke_args);
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
+  result =
+      Dart_InvokeClosure(reflectee, invoke_args.length(), invoke_args.data());
+  if (Dart_IsError(result)) {
+    // Instead of propagating the error from an apply directly, we
+    // provide reflective access to the error.
+    Dart_PropagateError(CreateMirroredError(result));
+  }
+
+  Dart_Handle wrapped_result = CreateInstanceMirror(result);
+  if (Dart_IsError(wrapped_result)) {
+    Dart_PropagateError(wrapped_result);
+  }
+  Dart_SetReturnValue(args, wrapped_result);
+  Dart_ExitScope();
+}
+
+
+void NATIVE_ENTRY_FUNCTION(LocalClassMirrorImpl_invokeConstructor)(
+    Dart_NativeArguments args) {
+  Dart_EnterScope();
+  Dart_Handle klass_mirror = Dart_GetNativeArgument(args, 0);
+  Dart_Handle constructor_name = Dart_GetNativeArgument(args, 1);
+
+  Dart_Handle wrapped_invoke_args = Dart_GetNativeArgument(args, 2);
+
+  Dart_Handle klass = UnwrapMirror(klass_mirror);
+  GrowableArray<Dart_Handle> invoke_args;
+  Dart_Handle result = UnpackLocalArgList(wrapped_invoke_args, &invoke_args);
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
+  result = Dart_New(klass,
+                    constructor_name,
+                    invoke_args.length(),
+                    invoke_args.data());
+  if (Dart_IsError(result)) {
+    // Instead of propagating the error from an invoke directly, we
+    // provide reflective access to the error.
+    Dart_PropagateError(CreateMirroredError(result));
+  }
+
+  Dart_Handle wrapped_result = CreateInstanceMirror(result);
+  if (Dart_IsError(wrapped_result)) {
+    Dart_PropagateError(wrapped_result);
+  }
+  Dart_SetReturnValue(args, wrapped_result);
+  Dart_ExitScope();
+}
+
 
 void HandleMirrorsMessage(Isolate* isolate,
                           Dart_Port reply_port,
                           const Instance& message) {
   UNIMPLEMENTED();
 }
 
 }  // namespace dart