Added Dart_FunctionEnclosingClassOrLibrary.

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 2766 matching lines @@
   func_name = func.name();
   bool is_setter = Field::IsSetterName(func_name);
   func_name = IdentifierPrettyName(isolate, func_name);
   if (is_setter) {
     func_name = AddExternalSetterSuffix(func_name);
   }
   return Api::NewHandle(isolate, func_name.raw());
 }
 
 
+DART_EXPORT Dart_Handle Dart_FunctionEnclosingClassOrLibrary(
+    Dart_Handle function) {
+  Isolate* isolate = Isolate::Current();
+  DARTSCOPE(isolate);
+  const Function& func = Api::UnwrapFunctionHandle(isolate, function);
+  if (func.IsNull()) {
+    RETURN_TYPE_ERROR(isolate, function, Function);
+  }

[Ivan Posva, 2012/07/31 23:38:58]

if (func.IsError()) {
  return function;
}

[rmacnak, 2012/08/01 17:21:55]

If I add that test with an ASSERT(false), that path isn't taken even for error
cases like the argument being an error handle, an integer handle, or the null
handle. Same story in Dart_FunctionName (one function up).

On 2012/07/31 23:38:58, Ivan Posva wrote:

[turnidge, 2012/08/01 17:59:42]

Checking for an error handle isn't required here.  It is already done by the
combination of UnwrapFunctionHandle + RETURN_TYPE_ERROR.

[Ivan Posva, 2012/08/01 20:43:55]

Thanks for the clarification. The difference between UnwrapTypeHandle and
UnwrapHandle is very subtle and could lead to a lot of missed checks. But that
discussion does not belong into this CL review.

+  const Class& owner = Class::Handle(func.owner());
+  ASSERT(!owner.IsNull());
+  if (owner.IsTopLevel()) {
+    // Top-level functions are implemented as members of a hidden class. We hide
+    // that class here and instead answer the library.
+#if defined(DEBUG)
+    const Library& lib = Library::Handle(owner.library());
+    if (lib.IsNull()) {
+      ASSERT(owner.IsDynamicClass() || owner.IsVoidClass());
+    }
+#endif
+    return Api::NewHandle(isolate, owner.library());
+  } else {
+    return Api::NewHandle(isolate, owner.raw());
+  }
+}
+
+
 DART_EXPORT Dart_Handle Dart_FunctionIsAbstract(Dart_Handle function,
                                                 bool* is_abstract) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   if (is_abstract == NULL) {
     RETURN_NULL_ERROR(is_abstract);
   }
   const Function& func = Api::UnwrapFunctionHandle(isolate, function);
   if (func.IsNull()) {
     RETURN_TYPE_ERROR(isolate, function, Function);
@@ skipping 1379 matching lines @@
 DART_EXPORT void Dart_InitPerfEventsSupport(Dart_FileWriterFunction function) {
   Dart::set_perf_events_writer(function);
 }
 
 
 DART_EXPORT void Dart_InitFlowGraphPrinting(Dart_FileWriterFunction function) {
   Dart::set_flow_graph_writer(function);
 }
 
 }  // namespace dart