Windows produces different output for __FUNCTION__. Canonicalize.

runtime/vm/dart_api_impl.cc

Index: runtime/vm/dart_api_impl.cc
===================================================================
--- runtime/vm/dart_api_impl.cc	(revision 1420)
+++ runtime/vm/dart_api_impl.cc	(working copy)
@@ -27,6 +27,16 @@
 
 namespace dart {
 
+static const char* CanonicalFunction(const char* func) {
+  if (strncmp(func, "dart::", 6) == 0) {
+    return func + 6;
+  } else {
+    return func;
+  }
+}
+
+#define CURRENT_FUNC CanonicalFunction(__FUNCTION__)

[cshapiro, 2011/11/11 00:51:42]

I think you might want __PRETTY_NAME__ on G++ and __FUNCSIG__ on MSVC for
something more consistent.

I do not have access to a Windows machine to confirm this at the moment.

+
 #define UNWRAP_NONNULL(dart_handle, vm_handle, Type)                          \
   do {                                                                        \
     const Object& tmp = Object::Handle(Api::UnwrapHandle((dart_handle)));     \
@@ -34,12 +44,12 @@
       (vm_handle) ^= tmp.raw();                                               \
     } else if (tmp.IsNull()) {                                                \
       return Api::Error("%s expects argument '%s' to be non-null.",           \
-                        __FUNCTION__, #dart_handle);                          \
+                        CURRENT_FUNC, #dart_handle);                          \
     } else if (tmp.IsApiFailure()) {                                          \
       return dart_handle;                                                     \
     } else {                                                                  \
       return Api::Error("%s expects argument '%s' to be of type %s.",         \
-                        __FUNCTION__, #dart_handle, #Type);                   \
+                        CURRENT_FUNC, #dart_handle, #Type);                   \
     }                                                                         \
   } while (0)
 
@@ -417,7 +427,7 @@
   const Library& library = Library::Handle(Library::LookupLibrary(url_str));
   if (library.IsNull()) {
     return Api::Error("%s: library '%s' not found.",
-                      __FUNCTION__, url_str.ToCString());
+                      CURRENT_FUNC, url_str.ToCString());
   } else {
     return Api::NewLocalHandle(library);
   }